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

Commit a47bd414 authored by Pete Bentley's avatar Pete Bentley Committed by android-build-merger
Browse files

Merge "Export libjavacore into the conscrypt linker namespace." am: 43c17b0c 

am: e29eba6c

Change-Id: Ifb12717a76d31548fc55883e09a0b74782e6653e
parents a43a4eec e29eba6c

rootdir/etc/ld.config.legacy.txt

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

rootdir/etc/ld.config.txt

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

rootdir/etc/ld.config.vndk_lite.txt

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