Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba6135bd authored by vichang's avatar vichang Committed by Gerrit Code Review
Browse files

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

parents 3ca61ad9 b6056d68

core/envsetup.mk

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,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)

core/pdk_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -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 \