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

Commit 055708f2 authored by vichang's avatar vichang Committed by android-build-merger
Browse files

Merge changes from topic "dup_icu4c" 

am: ce912aad

Change-Id: Ied6cc731e1c57ab48340b5698c669933ed1ac7d7
parents 2c75b736 ce912aad

rootdir/etc/ld.config.legacy.txt

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ namespace.default.link.runtime.shared_libs += libdexfile_external.so 
namespace.default.link.runtime.shared_libs += libnativebridge.so

namespace.default.link.runtime.shared_libs += libnativehelper.so

namespace.default.link.runtime.shared_libs += libnativeloader.so

namespace.default.link.runtime.shared_libs += libandroidicu.so



# TODO(b/122876336): Remove libpac.so once it's migrated to Webview

namespace.default.link.runtime.shared_libs += libpac.so



# When libnetd_resolv.so can't be found in the default namespace, search for it

# in the resolv namespace. Don't allow any other libraries from the resolv namespace

rootdir/etc/ld.config.txt

+4 −0
Original line number Diff line number Diff line
@@ -132,6 +132,10 @@ namespace.default.link.runtime.shared_libs += libdexfile_external.so 
namespace.default.link.runtime.shared_libs += libnativebridge.so

namespace.default.link.runtime.shared_libs += libnativehelper.so

namespace.default.link.runtime.shared_libs += libnativeloader.so

namespace.default.link.runtime.shared_libs += libandroidicu.so



# TODO(b/122876336): Remove libpac.so once it's migrated to Webview

namespace.default.link.runtime.shared_libs += libpac.so



# When libnetd_resolv.so can't be found in the default namespace, search for it

# in the resolv namespace. Don't allow any other libraries from the resolv namespace

rootdir/etc/ld.config.vndk_lite.txt

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ namespace.default.link.runtime.shared_libs += libdexfile_external.so 
namespace.default.link.runtime.shared_libs += libnativebridge.so

namespace.default.link.runtime.shared_libs += libnativehelper.so

namespace.default.link.runtime.shared_libs += libnativeloader.so

namespace.default.link.runtime.shared_libs += libandroidicu.so



# TODO(b/122876336): Remove libpac.so once it's migrated to Webview

namespace.default.link.runtime.shared_libs += libpac.so



# When libnetd_resolv.so can't be found in the default namespace, search for it

# in the resolv namespace. Don't allow any other libraries from the resolv namespace