diff options
| author | Narayan Kamath <narayan@google.com> | 2016-01-08 11:13:56 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2016-01-08 11:49:04 +0000 |
| commit | b0340512cf0ee323ef16e04685ccd7608d1549d5 (patch) | |
| tree | 2f355b74fd196cada4ba0fe0efa80bdaed2e60df | |
| parent | bf679f7897cb1c3200b064603bd649343ec9534a (diff) | |
| download | javasqlite-b0340512cf0ee323ef16e04685ccd7608d1549d5.tar.gz | |
Depend on the static version of libsqlite_static_minimal.
libsqlite is a system library and we shouldn't rely on it being
available from a CTS package.
Also, build the target version of libsqlite_jni using NDK headers.
bug: 26457850
Change-Id: Ifbd7dc09dacd26b4f6962287660748adfdf10df1
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -18,10 +18,11 @@ include $(CLEAR_VARS) 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 @@ include $(CLEAR_VARS) 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) |