system/core
| Revision | 32190f45e069d03fe2a5f8926a49dff80fb2d1c3 (tree) |
|---|---|
| Zeit | 2019-05-20 19:59:51 |
| Autor | Victor Chang <vichang@goog...> |
| Commiter | Victor Chang |
Allow linking to libicuuc.so and libicui18n.so from executable in /data
Executable in /data/ runs in default linker namespace, not
classloader namespace.
In Q, we moved libicuuc.so and libicui18n into the runtime
namespace, and allow linking from runtime namespace and classloader
namespace.
This change further allows linking from default namespace, and tries
to fix the regression temporarily.
Bug: 130788466
Test: The app issue is fixed after this CL
Merged-In: Ifae52b554124514e433cfe78875643a7450fbabd
Change-Id: Ifae52b554124514e433cfe78875643a7450fbabd
(cherry picked from commit 0c7edece9453db4f6c7be3058e64881b9805f94e)
rootdir/etc/ld.config.legacy.txt (diff) rootdir/etc/ld.config.txt (diff) rootdir/etc/ld.config.vndk_lite.txt (diff)| @@ -58,6 +58,9 @@ namespace.default.link.runtime.shared_libs += libnativebridge.so | ||
| 58 | 58 | namespace.default.link.runtime.shared_libs += libnativehelper.so |
| 59 | 59 | namespace.default.link.runtime.shared_libs += libnativeloader.so |
| 60 | 60 | namespace.default.link.runtime.shared_libs += libandroidicu.so |
| 61 | +# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466 | |
| 62 | +namespace.default.link.runtime.shared_libs += libicui18n.so | |
| 63 | +namespace.default.link.runtime.shared_libs += libicuuc.so | |
| 61 | 64 | |
| 62 | 65 | # TODO(b/122876336): Remove libpac.so once it's migrated to Webview |
| 63 | 66 | namespace.default.link.runtime.shared_libs += libpac.so |
| @@ -133,6 +133,9 @@ namespace.default.links = runtime,resolv | ||
| 133 | 133 | # libart. |
| 134 | 134 | namespace.default.visible = true |
| 135 | 135 | namespace.default.link.runtime.shared_libs = libdexfile_external.so |
| 136 | +# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466 | |
| 137 | +namespace.default.link.runtime.shared_libs += libicui18n.so | |
| 138 | +namespace.default.link.runtime.shared_libs += libicuuc.so | |
| 136 | 139 | namespace.default.link.runtime.shared_libs += libnativebridge.so |
| 137 | 140 | namespace.default.link.runtime.shared_libs += libnativehelper.so |
| 138 | 141 | namespace.default.link.runtime.shared_libs += libnativeloader.so |
| @@ -502,6 +505,9 @@ namespace.system.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} | ||
| 502 | 505 | |
| 503 | 506 | namespace.system.links = runtime |
| 504 | 507 | namespace.system.link.runtime.shared_libs = libdexfile_external.so |
| 508 | +# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466 | |
| 509 | +namespace.system.link.runtime.shared_libs += libicui18n.so | |
| 510 | +namespace.system.link.runtime.shared_libs += libicuuc.so | |
| 505 | 511 | namespace.system.link.runtime.shared_libs += libnativebridge.so |
| 506 | 512 | namespace.system.link.runtime.shared_libs += libnativehelper.so |
| 507 | 513 | namespace.system.link.runtime.shared_libs += libnativeloader.so |
| @@ -578,6 +584,9 @@ namespace.default.links = runtime,resolv | ||
| 578 | 584 | namespace.default.visible = true |
| 579 | 585 | |
| 580 | 586 | namespace.default.link.runtime.shared_libs = libdexfile_external.so |
| 587 | +# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466 | |
| 588 | +namespace.default.link.runtime.shared_libs += libicui18n.so | |
| 589 | +namespace.default.link.runtime.shared_libs += libicuuc.so | |
| 581 | 590 | namespace.default.link.runtime.shared_libs += libnativebridge.so |
| 582 | 591 | namespace.default.link.runtime.shared_libs += libnativehelper.so |
| 583 | 592 | namespace.default.link.runtime.shared_libs += libnativeloader.so |
| @@ -74,6 +74,9 @@ namespace.default.links = runtime,resolv | ||
| 74 | 74 | # libart. |
| 75 | 75 | namespace.default.visible = true |
| 76 | 76 | namespace.default.link.runtime.shared_libs = libdexfile_external.so |
| 77 | +# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466 | |
| 78 | +namespace.default.link.runtime.shared_libs += libicui18n.so | |
| 79 | +namespace.default.link.runtime.shared_libs += libicuuc.so | |
| 77 | 80 | namespace.default.link.runtime.shared_libs += libnativebridge.so |
| 78 | 81 | namespace.default.link.runtime.shared_libs += libnativehelper.so |
| 79 | 82 | namespace.default.link.runtime.shared_libs += libnativeloader.so |
| @@ -355,6 +358,9 @@ namespace.default.asan.search.paths += /system/${LIB}/vndk%VNDK_VER% | ||
| 355 | 358 | |
| 356 | 359 | namespace.default.links = runtime |
| 357 | 360 | namespace.default.link.runtime.shared_libs = libdexfile_external.so |
| 361 | +# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466 | |
| 362 | +namespace.default.link.runtime.shared_libs += libicui18n.so | |
| 363 | +namespace.default.link.runtime.shared_libs += libicuuc.so | |
| 358 | 364 | namespace.default.link.runtime.shared_libs += libnativebridge.so |
| 359 | 365 | namespace.default.link.runtime.shared_libs += libnativehelper.so |
| 360 | 366 | namespace.default.link.runtime.shared_libs += libnativeloader.so |
| @@ -401,6 +407,9 @@ namespace.default.links = runtime,resolv | ||
| 401 | 407 | namespace.default.visible = true |
| 402 | 408 | |
| 403 | 409 | namespace.default.link.runtime.shared_libs = libdexfile_external.so |
| 410 | +# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466 | |
| 411 | +namespace.default.link.runtime.shared_libs += libicui18n.so | |
| 412 | +namespace.default.link.runtime.shared_libs += libicuuc.so | |
| 404 | 413 | namespace.default.link.runtime.shared_libs += libnativebridge.so |
| 405 | 414 | namespace.default.link.runtime.shared_libs += libnativehelper.so |
| 406 | 415 | namespace.default.link.runtime.shared_libs += libnativeloader.so |
Fork