Add jni libicu_jni library into ART APEX
- The library may be moved into i18n APEX in the future
Bug: 138994281
Test: device boots
Change-Id: I9c629224bb318acde744d470e7483a80b2473aa4
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 258a8b0..51327b3 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -504,6 +504,7 @@
$$(ART_GTEST_$(1)_TARGET_DEPS) \
$(foreach file,$(ART_GTEST_$(1)_DEX_DEPS),$(ART_TEST_TARGET_GTEST_$(file)_DEX)) \
$$(gtest_exe) \
+ $$($(3)TARGET_OUT_SHARED_LIBRARIES)/libicu_jni.so \
$$($(3)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \
$$($(3)TARGET_OUT_SHARED_LIBRARIES)/libopenjdkd.so \
$$(foreach jar,$$(TARGET_TEST_CORE_JARS),$$(TARGET_OUT_JAVA_LIBRARIES)/$$(jar).jar)
@@ -562,6 +563,7 @@
gtest_exe := $(2)
# Dependencies for all host gtests.
gtest_deps := $$(HOST_CORE_DEX_LOCATIONS) \
+ $$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libicu_jni$$(ART_HOST_SHLIB_EXTENSION) \
$$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$$(ART_HOST_SHLIB_EXTENSION) \
$$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkd$$(ART_HOST_SHLIB_EXTENSION) \
$$(gtest_exe) \