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

Commit 11c04904 authored by Victor Chang's avatar Victor Chang Committed by android-build-merger
Browse files

Merge "Allow linking to libicuuc.so and libicui18n.so from executable in /data" into qt-dev 

am: 28904625

Change-Id: I9e15dfd23cfdab5e16f615b694794b44b9e34937
parents ed81cc26 28904625

rootdir/etc/ld.config.legacy.txt

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ 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

# 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



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

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

rootdir/etc/ld.config.txt

+9 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ namespace.default.links = runtime,resolv 
# libart.

namespace.default.visible = true

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


namespace.system.links = runtime

namespace.system.link.runtime.shared_libs  = libdexfile_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
@@ -579,6 +585,9 @@ namespace.default.links = runtime,resolv 
namespace.default.visible = true



namespace.default.link.runtime.shared_libs  = libdexfile_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
@@ -74,6 +74,9 @@ namespace.default.links = runtime,resolv 
# libart.

namespace.default.visible = true

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


namespace.default.links = runtime

namespace.default.link.runtime.shared_libs  = libdexfile_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
@@ -401,6 +407,9 @@ namespace.default.links = runtime,resolv 
namespace.default.visible = true



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