diff options
| author | Pete Bentley <prb@google.com> | 2019-01-30 18:35:48 +0000 |
|---|---|---|
| committer | Pete Bentley <prb@google.com> | 2019-01-31 11:06:41 +0000 |
| commit | 7b967bf6cfb37f5180217bf00e57f23b6c6024f5 (patch) | |
| tree | d0a07a19ee21ae77d5c62fd653cc2223f8558453 /rootdir | |
| parent | ee0e63f71d90537bb0570e77aa8a699cc222cfaf (diff) | |
| download | system_core-7b967bf6cfb37f5180217bf00e57f23b6c6024f5.tar.gz system_core-7b967bf6cfb37f5180217bf00e57f23b6c6024f5.tar.bz2 system_core-7b967bf6cfb37f5180217bf00e57f23b6c6024f5.zip | |
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
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/etc/ld.config.legacy.txt | 3 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.txt | 3 | ||||
| -rw-r--r-- | 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 |