Tighten native API surface.
AsynchronousCloseMonitor is moved into libandroidio by
r.android.com/910073 and so libjavacore no longer needs to
be linked to the conscrypt namespace.
Bug: 123744297
Test: m && flashall
Test: atest CtsLibcoreOkHttpTestCases
Test: atest CtsLibcoreTestCases
Change-Id: Ic7500f57a854055c1a63f33b843234ce5792445a
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index a07b5a0..0ff1cbd 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -118,6 +118,7 @@
// Native libraries that support the core Java libraries.
libcore_native_shared_libs = [
"libandroidicu",
+ "libandroidio",
"libexpat",
"libicui18n",
"libicuuc",
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 1301be4..4885436 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -471,6 +471,7 @@
# Check that the mounted image contains Android Core libraries.
self._checker.check_library('libandroidicu.so')
+ self._checker.check_library('libandroidio.so')
self._checker.check_library('libexpat.so')
self._checker.check_library('libicui18n.so')
self._checker.check_library('libicuuc.so')
@@ -504,6 +505,7 @@
def run(self):
# Check that the mounted image contains Android Core libraries.
self._checker.check_library('libandroidicu-host.so')
+ self._checker.check_library('libandroidio.so')
self._checker.check_library('libexpat-host.so')
self._checker.check_library('libicui18n-host.so')
self._checker.check_library('libicuuc-host.so')
diff --git a/build/apex/ld.config.txt b/build/apex/ld.config.txt
index cbadcd8..8ac7446 100644
--- a/build/apex/ld.config.txt
+++ b/build/apex/ld.config.txt
@@ -68,7 +68,7 @@
namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
namespace.conscrypt.links = runtime,platform
-namespace.conscrypt.link.runtime.shared_libs = libjavacore.so
+namespace.conscrypt.link.runtime.shared_libs = libandroidio.so
namespace.conscrypt.link.platform.shared_libs = libc.so
namespace.conscrypt.link.platform.shared_libs += libm.so
namespace.conscrypt.link.platform.shared_libs += libdl.so