diff options
| author | 2018-12-18 12:06:45 +0000 | |
|---|---|---|
| committer | 2018-12-18 12:06:45 +0000 | |
| commit | 45d41846d93c5380cadb88c7bb6975b3b8865090 (patch) | |
| tree | 9adacb61d99cd3ce48093ec99d667b0843d5dc84 | |
| parent | 777cb01e3cdebbb5a578d67b631c34c9e4a517da (diff) | |
Move conscrypt back to core image to unblock Golem.
Test: Manually run a Golem benchmark.
Bug: 119868597
Change-Id: I9d7878a725ca8f4cd80d999a0f968943bb50ef9a
| -rw-r--r-- | build/Android.common_path.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index 5208d64ff3..c73b988b54 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -74,7 +74,8 @@ 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. -CORE_IMG_JARS := core-oj core-libart core-simple okhttp bouncycastle apache-xml +# 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 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) @@ -87,7 +88,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) conscrypt +TEST_CORE_JARS := $(CORE_IMG_JARS) 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) |