Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc6c50a1 authored by Pete Bentley's avatar Pete Bentley
Browse files

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
parent c3e96512

rootdir/etc/ld.config.legacy.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

rootdir/etc/ld.config.txt

+2 −2
Original line number Diff line number Diff line
@@ -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

rootdir/etc/ld.config.vndk_lite.txt

+2 −2
Original line number Diff line number Diff line
@@ -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