commit ee41d81872eedc632f42bd231b95bc945690d159
author Narayan Kamath <narayan@google.com> Mon Jan 11 11:45:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 11 11:45:49 2016 +0000
tree aee538e1a54bdf71faa95edf5c40973dec11057d
parent 7cc1358d01cf86c6f682fe0706049891bcaac855
parent 9ac7d459860b29b64828de5acb6e22e4b0bfefa6

Merge "Depend on the static version of libsqlite_static_minimal."
am: 9ac7d45986

* commit '9ac7d459860b29b64828de5acb6e22e4b0bfefa6':
  Depend on the static version of libsqlite_static_minimal.

Android.mk

diff --git a/Android.mk b/Android.mk
index 38e7dce..c095a09 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,10 +18,11 @@
 LOCAL_CFLAGS := $(sqlite_cflags)
 LOCAL_SRC_FILES := $(sqlite_jdbc_src_files)
 LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes)
-LOCAL_SHARED_LIBRARIES += libsqlite
+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)
@@ -36,7 +37,7 @@
 LOCAL_CFLAGS := $(sqlite_cflags)
 LOCAL_SRC_FILES := $(sqlite_jdbc_src_files)
 LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes)
-LOCAL_SHARED_LIBRARIES += libsqlite
+LOCAL_STATIC_LIBRARIES += libsqlite_static_minimal
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libsqlite_jni
 include $(BUILD_HOST_SHARED_LIBRARY)