commit e0a3dc4ba206102bca7b0298e8de7f6b1640e74b
author Ian Rogers <irogers@google.com> Wed Jun 11 19:26:01 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 11 19:26:01 2014 +0000
tree 5d57246dc0e78ddcbaa32e4032413748a8e651ba
parent c45943d376cdc6ae9089e65777487df7e1251898
parent 6984b8188bf3ea75d1edd5b6c1153580d8ff0a33

am 6984b818: Merge "Remove deprecated WITH_HOST_DALVIK."

* commit '6984b8188bf3ea75d1edd5b6c1153580d8ff0a33':
  Remove deprecated WITH_HOST_DALVIK.

Android.mk

diff --git a/Android.mk b/Android.mk
index 49b2d1b..f2a29e0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,20 +25,18 @@
 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)