diff options
| author | Narayan Kamath <narayan@google.com> | 2013-10-28 14:17:35 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2013-11-25 18:31:15 +0000 |
| commit | 70e8ce8186788e520330e71681af30cfd939fa4b (patch) | |
| tree | 2eb1b89a9ba50fd12c3909a762bdfc72f8594556 /JavaLibrary.mk | |
| parent | 6be37f5f3d46daecf6c0d3e1078e25cca3ce4732 (diff) | |
| download | libcore-70e8ce8186788e520330e71681af30cfd939fa4b.zip libcore-70e8ce8186788e520330e71681af30cfd939fa4b.tar.gz libcore-70e8ce8186788e520330e71681af30cfd939fa4b.tar.bz2 | |
Remove uses of LOCAL_BUILD_HOST_DEX
Use the new BUILD_HOST_DALVIK_JAVA_LIBRARY instead.
(cherry picked from commit bb99b4971afcf5616ad0a3d2b8edaf3bd74d101b)
Change-Id: If6822157b02126ede86b2e9cd4db11bdbae5b82b
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 8252954..baa2d53 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -173,12 +173,11 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_DX_FLAGS := --core-library - LOCAL_BUILD_HOST_DEX := true LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk LOCAL_REQUIRED_MODULES := tzdata-host - include $(BUILD_HOST_JAVA_LIBRARY) + include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libart_core_src_files) @@ -186,12 +185,11 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_DX_FLAGS := --core-library - LOCAL_BUILD_HOST_DEX := true LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-libart-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk LOCAL_REQUIRED_MODULES := tzdata-host - include $(BUILD_HOST_JAVA_LIBRARY) + include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) # Make the core-tests library. ifeq ($(LIBCORE_SKIP_TESTS),) @@ -199,14 +197,13 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_SRC_FILES := $(test_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true - LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex core-tests-support-hostdex okhttp-hostdex + LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-junit-hostdex core-tests-support-hostdex okhttp-hostdex LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host mockwebserver-host nist-pkix-tests-host LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-tests-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk - LOCAL_BUILD_HOST_DEX := true - include $(BUILD_HOST_JAVA_LIBRARY) + include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif # Make the core-tests-support library. @@ -214,14 +211,12 @@ ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,support) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) - LOCAL_NO_STANDARD_LIBRARIES := true - LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex + LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-junit-hostdex LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-tests-support-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk - LOCAL_BUILD_HOST_DEX := true - include $(BUILD_HOST_JAVA_LIBRARY) + include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif endif |