Use soong to build JNI code
Test: compilation test
Change-Id: I1a49d4762da06079553f99ebf4f759cca0672752
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..726a790
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,3 @@
+subdirs = [
+ "jni",
+]
diff --git a/jni/Android.bp b/jni/Android.bp
new file mode 100644
index 0000000..430135f
--- /dev/null
+++ b/jni/Android.bp
@@ -0,0 +1,35 @@
+cc_library_shared {
+ name: "libbluetooth_jni",
+ srcs: [
+ "com_android_bluetooth_btservice_AdapterService.cpp",
+ "com_android_bluetooth_hfp.cpp",
+ "com_android_bluetooth_hfpclient.cpp",
+ "com_android_bluetooth_a2dp.cpp",
+ "com_android_bluetooth_a2dp_sink.cpp",
+ "com_android_bluetooth_avrcp.cpp",
+ "com_android_bluetooth_avrcp_controller.cpp",
+ "com_android_bluetooth_hid.cpp",
+ "com_android_bluetooth_hidd.cpp",
+ "com_android_bluetooth_hdp.cpp",
+ "com_android_bluetooth_pan.cpp",
+ "com_android_bluetooth_gatt.cpp",
+ "com_android_bluetooth_sdp.cpp",
+ ],
+ include_dirs: [
+ "libnativehelper/include/nativehelper",
+ ],
+ shared_libs: [
+ "libandroid_runtime",
+ "libchrome",
+ "libnativehelper",
+ "libcutils",
+ "libutils",
+ "liblog",
+ "libhardware",
+ ],
+ cflags: [
+ "-Wall",
+ "-Wextra",
+ "-Wno-unused-parameter",
+ ],
+}
diff --git a/jni/Android.mk b/jni/Android.mk
deleted file mode 100644
index 971b614..0000000
--- a/jni/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- com_android_bluetooth_btservice_AdapterService.cpp \
- com_android_bluetooth_hfp.cpp \
- com_android_bluetooth_hfpclient.cpp \
- com_android_bluetooth_a2dp.cpp \
- com_android_bluetooth_a2dp_sink.cpp \
- com_android_bluetooth_avrcp.cpp \
- com_android_bluetooth_avrcp_controller.cpp \
- com_android_bluetooth_hid.cpp \
- com_android_bluetooth_hidd.cpp \
- com_android_bluetooth_hdp.cpp \
- com_android_bluetooth_pan.cpp \
- com_android_bluetooth_gatt.cpp \
- com_android_bluetooth_sdp.cpp
-
-LOCAL_C_INCLUDES += \
- $(JNI_H_INCLUDE) \
-
-LOCAL_SHARED_LIBRARIES := \
- libandroid_runtime \
- libchrome \
- libnativehelper \
- libcutils \
- libutils \
- liblog \
- libhardware
-
-LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-parameter
-
-LOCAL_MODULE := libbluetooth_jni
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)