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

Commit 43c17b0c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Export libjavacore into the conscrypt linker namespace."

parents b7062df8 7b967bf6

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