From ba267996dc03bc0daea073ff6d1f3eebf706aa3b Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Tue, 14 Sep 2010 16:45:04 -0700 Subject: [PATCH] Support sqlite_jni on the dalvikvm host build. Change-Id: I9aac98e43cdb22b272dfe55e525fb352e0106e1c --- sqlite-jdbc/Android.mk | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/sqlite-jdbc/Android.mk b/sqlite-jdbc/Android.mk index 2c3926ab..40e7a0b5 100644 --- a/sqlite-jdbc/Android.mk +++ b/sqlite-jdbc/Android.mk @@ -1,23 +1,28 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := \ - src/main/native/sqlite_jni.c +sqlite_jdbc_src_files := \ + src/main/native/sqlite_jni.c +sqlite_jdbc_local_c_includes := \ + $(JNI_H_INCLUDE) \ + external/sqlite/dist -LOCAL_C_INCLUDES += \ - $(JNI_H_INCLUDE) \ - external/sqlite/dist -LOCAL_SHARED_LIBRARIES += \ - libsqlite - -LOCAL_STATIC_LIBRARIES += +LOCAL_PATH := $(call my-dir) -# This name is dictated by the fact that the SQLite code calls -# loadLibrary("sqlite_jni"). +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(sqlite_jdbc_src_files) +LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes) +LOCAL_SHARED_LIBRARIES += libsqlite +# This name is dictated by the fact that the SQLite code calls loadLibrary("sqlite_jni"). LOCAL_MODULE := libsqlite_jni - TARGET_PRELINK_MODULE := false - include $(BUILD_SHARED_LIBRARY) + +ifeq ($(WITH_HOST_DALVIK),true) + include $(CLEAR_VARS) + LOCAL_SRC_FILES := $(sqlite_jdbc_src_files) + LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes) + LOCAL_SHARED_LIBRARIES += libsqlite + LOCAL_MODULE := libsqlite_jni + TARGET_PRELINK_MODULE := false + include $(BUILD_HOST_SHARED_LIBRARY) +endif \ No newline at end of file -- 2.11.0