From b6056d68561a4e97226c7a708b8285f71c99bbd1 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Tue, 6 Aug 2019 16:54:08 +0100 Subject: [PATCH] Add new core-icu4j after separating icu4j from core-libart Bug: 138994281 Test: m droid Change-Id: Ib2a7a464a4cc0030061c018c1941db5c28a90b7d --- core/envsetup.mk | 2 +- core/pdk_config.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index 05957cdb57..4502e43015 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -253,7 +253,7 @@ endef # java code with dalvikvm/art. # Jars present in the runtime apex. These should match exactly the list of # Java libraries in the runtime apex build rule. -RUNTIME_APEX_JARS := core-oj core-libart okhttp bouncycastle apache-xml +RUNTIME_APEX_JARS := core-oj core-libart core-icu4j okhttp bouncycastle apache-xml TARGET_CORE_JARS := $(RUNTIME_APEX_JARS) conscrypt ifeq ($(EMMA_INSTRUMENT),true) ifneq ($(EMMA_INSTRUMENT_STATIC),true) diff --git a/core/pdk_config.mk b/core/pdk_config.mk index ce78ecedcc..4a069d3d10 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -20,6 +20,7 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \ target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \ target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \ target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \ + target/common/obj/JAVA_LIBRARIES/core-icu4j_intermediates \ target/common/obj/JAVA_LIBRARIES/ext_intermediates \ target/common/obj/JAVA_LIBRARIES/framework_intermediates \ target/common/obj/JAVA_LIBRARIES/hwbinder_intermediates \