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

Commit 5c75fb81 authored by vichang's avatar vichang Committed by android-build-merger
Browse files

Merge "Allow linking to libicuuc.so and libicui18n.so from executable in /data" 

am: de725e6e

Change-Id: Iff94f22ed4dc64e446e746982561f4750ea32347
parents 77a2e830 de725e6e

rootdir/etc/ld.config.legacy.txt

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ namespace.default.asan.links = runtime,resolv 
namespace.default.link.runtime.shared_libs  = libandroidicu.so

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

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

# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466

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

namespace.default.link.runtime.shared_libs += libicuuc.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

rootdir/etc/ld.config.txt

+9 −0
Original line number Diff line number Diff line
@@ -135,6 +135,9 @@ namespace.default.links = runtime,resolv 
namespace.default.link.runtime.shared_libs  = libandroidicu.so

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

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

# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466

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

namespace.default.link.runtime.shared_libs += libicuuc.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
@@ -512,6 +515,9 @@ namespace.system.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} 
namespace.system.links = runtime

namespace.system.link.runtime.shared_libs  = libdexfile_external.so

namespace.system.link.runtime.shared_libs += libdexfiled_external.so

# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466

namespace.system.link.runtime.shared_libs += libicui18n.so

namespace.system.link.runtime.shared_libs += libicuuc.so

namespace.system.link.runtime.shared_libs += libnativebridge.so

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

namespace.system.link.runtime.shared_libs += libnativeloader.so
@@ -592,6 +598,9 @@ namespace.default.links = runtime,resolv 
namespace.default.link.runtime.shared_libs  = libandroidicu.so

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

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

# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466

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

namespace.default.link.runtime.shared_libs += libicuuc.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

rootdir/etc/ld.config.vndk_lite.txt

+9 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ namespace.default.links = runtime,resolv 
namespace.default.link.runtime.shared_libs  = libandroidicu.so

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

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

# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466

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

namespace.default.link.runtime.shared_libs += libicuuc.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
@@ -363,6 +366,9 @@ namespace.default.asan.search.paths += /system/${LIB}/vndk%VNDK_VER% 
namespace.default.links = runtime

namespace.default.link.runtime.shared_libs  = libdexfile_external.so

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

# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466

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

namespace.default.link.runtime.shared_libs += libicuuc.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
@@ -413,6 +419,9 @@ namespace.default.links = runtime,resolv 
namespace.default.link.runtime.shared_libs  = libandroidicu.so

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

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

# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466

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

namespace.default.link.runtime.shared_libs += libicuuc.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