Merge "Convert libsqlite_jni to Android.bp"
am: 16ac73c020
Change-Id: Icf6206edf3b061ce403cf773bad7d3574ee8d844
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..dad4cd0
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,10 @@
+cc_library_shared {
+ // This name is dictated by the fact that the SQLite code calls loadLibrary("sqlite_jni").
+ name: "libsqlite_jni",
+ host_supported: true,
+ cflags: ["-Wno-unused-parameter"],
+ srcs: ["src/main/native/sqlite_jni.c"],
+ static_libs: ["libsqlite_static_minimal"],
+
+ sdk_version: "23",
+}
diff --git a/Android.mk b/Android.mk
index c095a09..f7a3f20 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,10 +2,6 @@
LOCAL_PATH := $(call my-dir)
-sqlite_jdbc_src_files := src/main/native/sqlite_jni.c
-sqlite_jdbc_local_c_includes := external/sqlite/dist
-sqlite_cflags := -Wno-unused-parameter
-
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
LOCAL_NO_STANDARD_LIBRARIES := true
@@ -14,17 +10,6 @@
LOCAL_MODULE := sqlite-jdbc
include $(BUILD_STATIC_JAVA_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_CFLAGS := $(sqlite_cflags)
-LOCAL_SRC_FILES := $(sqlite_jdbc_src_files)
-LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes)
-LOCAL_STATIC_LIBRARIES += libsqlite_static_minimal
-LOCAL_MODULE_TAGS := optional
-# This name is dictated by the fact that the SQLite code calls loadLibrary("sqlite_jni").
-LOCAL_MODULE := libsqlite_jni
-LOCAL_SDK_VERSION := 23
-include $(BUILD_SHARED_LIBRARY)
-
ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
@@ -32,12 +17,3 @@
LOCAL_MODULE := sqlite-jdbc-host
include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
endif # HOST_OS == linux.
-
-include $(CLEAR_VARS)
-LOCAL_CFLAGS := $(sqlite_cflags)
-LOCAL_SRC_FILES := $(sqlite_jdbc_src_files)
-LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes)
-LOCAL_STATIC_LIBRARIES += libsqlite_static_minimal
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libsqlite_jni
-include $(BUILD_HOST_SHARED_LIBRARY)
