ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Victor Chang 2019-05-22 15:43:44 +00:00 • committed by Android (Google) Code Review
commit 28904625b8
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rootdir/etc/ld.config.legacy.txt
View file

@ -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 += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.so namespace.default.link.runtime.shared_libs += libnativeloader.so
namespace.default.link.runtime.shared_libs += libandroidicu.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 # TODO(b/122876336): Remove libpac.so once it's migrated to Webview
namespace.default.link.runtime.shared_libs += libpac.so namespace.default.link.runtime.shared_libs += libpac.so

9
rootdir/etc/ld.config.txt
View file

@ -133,6 +133,9 @@ namespace.default.links = runtime,resolv
# libart. # libart.
namespace.default.visible = true namespace.default.visible = true
namespace.default.link.runtime.shared_libs = libdexfile_external.so 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 += libnativebridge.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.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.links = runtime
namespace.system.link.runtime.shared_libs = libdexfile_external.so 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 += libnativebridge.so
namespace.system.link.runtime.shared_libs += libnativehelper.so namespace.system.link.runtime.shared_libs += libnativehelper.so
namespace.system.link.runtime.shared_libs += libnativeloader.so namespace.system.link.runtime.shared_libs += libnativeloader.so
@ -579,6 +585,9 @@ namespace.default.links = runtime,resolv
namespace.default.visible = true namespace.default.visible = true
namespace.default.link.runtime.shared_libs = libdexfile_external.so 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 += libnativebridge.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.so namespace.default.link.runtime.shared_libs += libnativeloader.so

9
rootdir/etc/ld.config.vndk_lite.txt
View file

@ -74,6 +74,9 @@ namespace.default.links = runtime,resolv
# libart. # libart.
namespace.default.visible = true namespace.default.visible = true
namespace.default.link.runtime.shared_libs = libdexfile_external.so 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 += libnativebridge.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.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.links = runtime
namespace.default.link.runtime.shared_libs = libdexfile_external.so 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 += libnativebridge.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.so namespace.default.link.runtime.shared_libs += libnativeloader.so
@ -401,6 +407,9 @@ namespace.default.links = runtime,resolv
namespace.default.visible = true namespace.default.visible = true
namespace.default.link.runtime.shared_libs = libdexfile_external.so 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 += libnativebridge.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.so namespace.default.link.runtime.shared_libs += libnativeloader.so