Convert libandroid and libandroid_runtime to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
diff --git a/native/android/Android.bp b/native/android/Android.bp
index eacda93..452adc0 100644
--- a/native/android/Android.bp
+++ b/native/android/Android.bp
@@ -19,3 +19,71 @@
first_version: "9",
unversioned_until: "current",
}
+
+cc_defaults {
+ name: "libandroid_defaults",
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wunused",
+ "-Wunreachable-code",
+ ],
+}
+
+cc_library_shared {
+ name: "libandroid",
+ defaults: ["libandroid_defaults"],
+
+ srcs: [
+ "asset_manager.cpp",
+ "choreographer.cpp",
+ "configuration.cpp",
+ "hardware_buffer_jni.cpp",
+ "input.cpp",
+ "looper.cpp",
+ "native_activity.cpp",
+ "native_window_jni.cpp",
+ "net.c",
+ "obb.cpp",
+ "sensor.cpp",
+ "sharedmem.cpp",
+ "storage_manager.cpp",
+ "trace.cpp",
+ ],
+
+ shared_libs: [
+ "liblog",
+ "libcutils",
+ "libandroidfw",
+ "libinput",
+ "libutils",
+ "libbinder",
+ "libui",
+ "libgui",
+ "libsensor",
+ "libandroid_runtime",
+ "libnetd_client",
+ ],
+
+ static_libs: [
+ "libstorage",
+ "libarect",
+ ],
+
+ whole_static_libs: ["libnativewindow"],
+
+ export_static_lib_headers: ["libarect"],
+
+ include_dirs: ["bionic/libc/dns/include"],
+}
+
+// Network library.
+cc_library_shared {
+ name: "libandroid_net",
+ defaults: ["libandroid_defaults"],
+ srcs: ["net.c"],
+
+ shared_libs: ["libnetd_client"],
+
+ include_dirs: ["bionic/libc/dns/include"],
+}
diff --git a/native/android/Android.mk b/native/android/Android.mk
deleted file mode 100644
index 6e15331..0000000
--- a/native/android/Android.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-BASE_PATH := $(call my-dir)
-LOCAL_PATH:= $(call my-dir)
-
-common_cflags := -Wall -Werror -Wunused -Wunreachable-code
-
-include $(CLEAR_VARS)
-
-# our source files
-#
-LOCAL_SRC_FILES:= \
- asset_manager.cpp \
- choreographer.cpp \
- configuration.cpp \
- hardware_buffer_jni.cpp \
- input.cpp \
- looper.cpp \
- native_activity.cpp \
- native_window_jni.cpp \
- net.c \
- obb.cpp \
- sensor.cpp \
- sharedmem.cpp \
- storage_manager.cpp \
- trace.cpp \
-
-LOCAL_SHARED_LIBRARIES := \
- liblog \
- libcutils \
- libandroidfw \
- libinput \
- libutils \
- libbinder \
- libui \
- libgui \
- libsensor \
- libandroid_runtime \
- libnetd_client \
-
-LOCAL_STATIC_LIBRARIES := \
- libstorage \
- libarect \
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
- libnativewindow
-
-LOCAL_C_INCLUDES += \
- frameworks/base/native/include \
- frameworks/base/core/jni/android \
- bionic/libc/dns/include \
- system/netd/include \
-
-LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := \
- libarect \
- libnativewindow \
-
-LOCAL_MODULE := libandroid
-
-LOCAL_CFLAGS += $(common_cflags)
-
-include $(BUILD_SHARED_LIBRARY)
-
-# Network library.
-include $(CLEAR_VARS)
-LOCAL_MODULE := libandroid_net
-LOCAL_CFLAGS := $(common_cflags)
-LOCAL_SRC_FILES:= \
- net.c \
-
-LOCAL_SHARED_LIBRARIES := \
- libnetd_client \
-
-LOCAL_C_INCLUDES += \
- frameworks/base/native/include \
- bionic/libc/dns/include \
- system/netd/include \
-
-include $(BUILD_SHARED_LIBRARY)