StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new core-icu4j after separating icu4j from core-libart"

Browse Source
This commit is contained in:
vichang
2019-08-12 15:36:44 +00:00
committed by Gerrit Code Review
parent 3ca61ad9d9 b6056d6856
commit ba6135bd80
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/envsetup.mk
View File

@@ -258,7 +258,7 @@ endef
# java code with dalvikvm/art. # java code with dalvikvm/art.
# Jars present in the runtime apex. These should match exactly the list of # Jars present in the runtime apex. These should match exactly the list of
# Java libraries in the runtime apex build rule. # 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 TARGET_CORE_JARS := $(RUNTIME_APEX_JARS) conscrypt
ifeq ($(EMMA_INSTRUMENT),true) ifeq ($(EMMA_INSTRUMENT),true)
ifneq ($(EMMA_INSTRUMENT_STATIC),true) ifneq ($(EMMA_INSTRUMENT_STATIC),true)

1
core/pdk_config.mk
View File

@@ -20,6 +20,7 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \
target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \ target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \
target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \ target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \
target/common/obj/JAVA_LIBRARIES/core-libart_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/ext_intermediates \
target/common/obj/JAVA_LIBRARIES/framework_intermediates \ target/common/obj/JAVA_LIBRARIES/framework_intermediates \
target/common/obj/JAVA_LIBRARIES/hwbinder_intermediates \ target/common/obj/JAVA_LIBRARIES/hwbinder_intermediates \