[sc] Add new public library libicu.so
Bug: 160350521
Bug: 172196072
Test: bionic-unit-tests
Change-Id: If3a45ddf95c4962ff5f3363d302e697f4d8380cf
diff --git a/native_bridge_support.mk b/native_bridge_support.mk
index b56361f..5c1741c 100644
--- a/native_bridge_support.mk
+++ b/native_bridge_support.mk
@@ -28,23 +28,7 @@
native_bridge_guest_app_process.native_bridge \
native_bridge_guest_linker.native_bridge
-# Original guest libraries.
-NATIVE_BRIDGE_ORIG_GUEST_LIBS := \
- libcompiler_rt \
- libcrypto \
- libcutils \
- libdl.bootstrap \
- libdl_android.bootstrap \
- liblog \
- libm.bootstrap \
- libsqlite \
- libssl \
- libstdc++ \
- libsync \
- libutils \
- libz
-
-# TODO(b/141167717): hack to make libandroidicu compatible with APEX.
+# TODO(b/141167717): using "bootstrap" to make APEX libraries compatible with native bridge:
#
# If library is APEX-enabled:
#
@@ -60,8 +44,24 @@
# /system/lib/$GUEST_ARCH/ - as we need for native bridge.
#
# Note: this doesn't affect native libraries at all.
-NATIVE_BRIDGE_ORIG_GUEST_LIBS += \
- libandroidicu.bootstrap
+
+# Original guest libraries.
+NATIVE_BRIDGE_ORIG_GUEST_LIBS := \
+ libandroidicu.bootstrap \
+ libcompiler_rt \
+ libcrypto \
+ libcutils \
+ libdl.bootstrap \
+ libdl_android.bootstrap \
+ libicu.bootstrap \
+ liblog \
+ libm.bootstrap \
+ libsqlite \
+ libssl \
+ libstdc++ \
+ libsync \
+ libutils \
+ libz
NATIVE_BRIDGE_PRODUCT_PACKAGES += \
libclcore.bc \