From cc6c50a1231df7c0c24ecfb023773247b88bdbbc Mon Sep 17 00:00:00 2001 From: Pete Bentley Date: Thu, 21 Mar 2019 17:13:14 +0000 Subject: [PATCH] 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: Id720b59e4ef42a2c0226b497a1cc3c54f7a837d0 --- rootdir/etc/ld.config.legacy.txt | 2 +- rootdir/etc/ld.config.txt | 4 ++-- rootdir/etc/ld.config.vndk_lite.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rootdir/etc/ld.config.legacy.txt b/rootdir/etc/ld.config.legacy.txt index fa463343c..9cf93ca02 100644 --- a/rootdir/etc/ld.config.legacy.txt +++ b/rootdir/etc/ld.config.legacy.txt @@ -127,7 +127,7 @@ namespace.conscrypt.visible = true namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.links = runtime,default -namespace.conscrypt.link.runtime.shared_libs = libjavacore.so +namespace.conscrypt.link.runtime.shared_libs = libandroidio.so namespace.conscrypt.link.default.shared_libs = libc.so namespace.conscrypt.link.default.shared_libs += libm.so namespace.conscrypt.link.default.shared_libs += libdl.so diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 927587bf3..85deacf75 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -196,7 +196,7 @@ namespace.conscrypt.visible = true namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.links = runtime,default -namespace.conscrypt.link.runtime.shared_libs = libjavacore.so +namespace.conscrypt.link.runtime.shared_libs = libandroidio.so namespace.conscrypt.link.default.shared_libs = libc.so namespace.conscrypt.link.default.shared_libs += libm.so namespace.conscrypt.link.default.shared_libs += libdl.so @@ -637,7 +637,7 @@ namespace.conscrypt.visible = true namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.links = runtime,default -namespace.conscrypt.link.runtime.shared_libs = libjavacore.so +namespace.conscrypt.link.runtime.shared_libs = libandroidio.so namespace.conscrypt.link.default.shared_libs = libc.so namespace.conscrypt.link.default.shared_libs += libm.so namespace.conscrypt.link.default.shared_libs += libdl.so diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index beb6125d7..26e1dd9ac 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -138,7 +138,7 @@ namespace.conscrypt.visible = true namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.links = runtime,default -namespace.conscrypt.link.runtime.shared_libs = libjavacore.so +namespace.conscrypt.link.runtime.shared_libs = libandroidio.so namespace.conscrypt.link.default.shared_libs = libc.so namespace.conscrypt.link.default.shared_libs += libm.so namespace.conscrypt.link.default.shared_libs += libdl.so @@ -460,7 +460,7 @@ namespace.conscrypt.visible = true namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.links = runtime,default -namespace.conscrypt.link.runtime.shared_libs = libjavacore.so +namespace.conscrypt.link.runtime.shared_libs = libandroidio.so namespace.conscrypt.link.default.shared_libs = libc.so namespace.conscrypt.link.default.shared_libs += libm.so namespace.conscrypt.link.default.shared_libs += libdl.so