commit b32d679b1e2d011115fc8ead3d62c0401187c7ac
author Narayan Kamath <narayan@google.com> Mon Oct 28 14:22:43 2013 +0000
committer Narayan Kamath <narayan@google.com> Mon Nov 25 11:52:34 2013 +0000
tree adbc4bef4943590f5d87a3d9cd87fae3befe48be
parent 1e6c788728c218e763f6fc42f8369ac0d502f469

Remove uses of LOCAL_BUILD_HOST_DEX

Use the new BUILD_HOST_DALVIK_JAVA_LIBRARY rule instead.

(cherry picked from commit 44419837f838eab28d0f347561715cbd00150168)

Change-Id: Ib126703f927c0f6e7f8c3746ff7348864aa49a39

Android.mk

diff --git a/Android.mk b/Android.mk
index cb71664..b6dcefa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -116,42 +116,35 @@
     # Make the conscrypt-hostdex library
     include $(CLEAR_VARS)
     LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
-    LOCAL_JAVA_LIBRARIES := core-hostdex
-    LOCAL_NO_STANDARD_LIBRARIES := true
     LOCAL_JAVACFLAGS := $(local_javac_flags)
     LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
-    LOCAL_BUILD_HOST_DEX := true
     LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := conscrypt-hostdex
     LOCAL_REQUIRED_MODULES := libjavacrypto
     LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-    include $(BUILD_HOST_JAVA_LIBRARY)
+    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
 
     # Make the conscrypt-hostdex-nojarjar for tests
     include $(CLEAR_VARS)
     LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
-    LOCAL_JAVA_LIBRARIES := core-hostdex
-    LOCAL_NO_STANDARD_LIBRARIES := true
     LOCAL_JAVACFLAGS := $(local_javac_flags)
     LOCAL_BUILD_HOST_DEX := true
     LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := conscrypt-hostdex-nojarjar
     LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-    include $(BUILD_HOST_JAVA_LIBRARY)
+    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
 
     # Make the conscrypt-tests library.
     ifeq ($(LIBCORE_SKIP_TESTS),)
     include $(CLEAR_VARS)
     LOCAL_SRC_FILES := $(call all-java-files-under,src/test/java)
-    LOCAL_NO_STANDARD_LIBRARIES := true
-    LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex core-tests-support-hostdex conscrypt-hostdex-nojarjar
+    LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-junit-hostdex core-tests-support-hostdex conscrypt-hostdex-nojarjar
     LOCAL_JAVACFLAGS := $(local_javac_flags)
     LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := conscrypt-tests-hostdex
     LOCAL_REQUIRED_MODULES := libjavacrypto
     LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-    LOCAL_BUILD_HOST_DEX := true
-    include $(BUILD_HOST_JAVA_LIBRARY)
+    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
     endif
 
     # Conscrypt native library for host