diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-10 03:25:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 03:25:57 +0000 |
| commit | 6984b8188bf3ea75d1edd5b6c1153580d8ff0a33 (patch) | |
| tree | 42220286ae5a5b255783f359ac97b7fab2f9e51c | |
| parent | 1bbcd337ec8d51bea41e0d44df57a7e93c8af181 (diff) | |
| parent | 015da7956d07565852b05541a66680699dd090e1 (diff) | |
| download | javasqlite-6984b8188bf3ea75d1edd5b6c1153580d8ff0a33.tar.gz | |
Merge "Remove deprecated WITH_HOST_DALVIK."
| -rw-r--r-- | Android.mk | 30 |
1 files changed, 14 insertions, 16 deletions
@@ -26,20 +26,18 @@ LOCAL_MODULE := libsqlite_jni LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) -ifeq ($(WITH_HOST_DALVIK),true) - include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java) - LOCAL_JAVACFLAGS := $(local_javac_flags) - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := sqlite-jdbc-host - include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java) +LOCAL_JAVACFLAGS := $(local_javac_flags) +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := sqlite-jdbc-host +include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) - include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(sqlite_jdbc_src_files) - LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes) - LOCAL_SHARED_LIBRARIES += libsqlite - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := libsqlite_jni - LOCAL_PRELINK_MODULE := false - include $(BUILD_HOST_SHARED_LIBRARY) -endif +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(sqlite_jdbc_src_files) +LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes) +LOCAL_SHARED_LIBRARIES += libsqlite +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libsqlite_jni +LOCAL_PRELINK_MODULE := false +include $(BUILD_HOST_SHARED_LIBRARY) |