From 7b967bf6cfb37f5180217bf00e57f23b6c6024f5 Mon Sep 17 00:00:00 2001 From: Pete Bentley Date: Wed, 30 Jan 2019 18:35:48 +0000 Subject: [PATCH] Export libjavacore into the conscrypt linker namespace. Needed to allow access to AsynchronousCloseMonitor. Bug: 123121395 Bug: 122881655 Test: atest CtsLibcoreOkHttpTestCases:com.squareup.okhttp.CallTest Change-Id: I1c73a9beb7a083a61ed52e437d7377b2486a34f7 --- rootdir/etc/ld.config.legacy.txt | 3 ++- rootdir/etc/ld.config.txt | 3 ++- rootdir/etc/ld.config.vndk_lite.txt | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rootdir/etc/ld.config.legacy.txt b/rootdir/etc/ld.config.legacy.txt index a854e93ce..48ca99839 100644 --- a/rootdir/etc/ld.config.legacy.txt +++ b/rootdir/etc/ld.config.legacy.txt @@ -105,7 +105,8 @@ namespace.conscrypt.visible = true # Keep in sync with ld.config.txt in the com.android.runtime APEX. namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB} -namespace.conscrypt.links = default +namespace.conscrypt.links = runtime,default +namespace.conscrypt.link.runtime.shared_libs = libjavacore.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 a61741871..611ea7fa6 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -176,7 +176,8 @@ namespace.conscrypt.visible = true # Keep in sync with ld.config.txt in the com.android.runtime APEX. namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB} -namespace.conscrypt.links = default +namespace.conscrypt.links = runtime,default +namespace.conscrypt.link.runtime.shared_libs = libjavacore.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 ae486eab5..d0662492e 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -124,7 +124,8 @@ namespace.conscrypt.visible = true # Keep in sync with ld.config.txt in the com.android.runtime APEX. namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB} namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB} -namespace.conscrypt.links = default +namespace.conscrypt.links = runtime,default +namespace.conscrypt.link.runtime.shared_libs = libjavacore.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