diff options
Diffstat (limited to 'build/Android.common_path.mk')
| -rw-r--r-- | build/Android.common_path.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index c73b988b54..5208d64ff3 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -74,8 +74,7 @@ HOST_CORE_IMG_LOCATION := $(HOST_OUT_JAVA_LIBRARIES)/core.art TARGET_CORE_IMG_LOCATION := $(ART_TARGET_TEST_OUT)/core.art # Modules to compile for core.art. -# TODO: Move conscrypt from CORE_IMG_JARS to TEST_CORE_JARS and adjust scripts to fix Golem. -CORE_IMG_JARS := core-oj core-libart core-simple okhttp bouncycastle apache-xml conscrypt +CORE_IMG_JARS := core-oj core-libart core-simple okhttp bouncycastle apache-xml HOST_CORE_IMG_JARS := $(addsuffix -hostdex,$(CORE_IMG_JARS)) TARGET_CORE_IMG_JARS := $(addsuffix -testdex,$(CORE_IMG_JARS)) HOST_CORE_IMG_DEX_LOCATIONS := $(foreach jar,$(HOST_CORE_IMG_JARS), $(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar) @@ -88,7 +87,7 @@ HOST_CORE_IMG_DEX_FILES := $(foreach jar,$(HOST_CORE_IMG_JARS), $(call interm TARGET_CORE_IMG_DEX_FILES := $(foreach jar,$(TARGET_CORE_IMG_JARS),$(call intermediates-dir-for,JAVA_LIBRARIES,$(jar), ,COMMON)/javalib.jar) # Jar files for the boot class path for testing. Must start with CORE_IMG_JARS. -TEST_CORE_JARS := $(CORE_IMG_JARS) +TEST_CORE_JARS := $(CORE_IMG_JARS) conscrypt HOST_TEST_CORE_JARS := $(addsuffix -hostdex,$(TEST_CORE_JARS)) TARGET_TEST_CORE_JARS := $(addsuffix -testdex,$(TEST_CORE_JARS)) HOST_CORE_DEX_LOCATIONS := $(foreach jar,$(HOST_TEST_CORE_JARS), $(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar) |