From 0d28abc5b1cc24b7c255356662ce2c1a29930e20 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Thu, 6 Jun 2019 14:11:04 +0100 Subject: [PATCH] Update TODOs for ICU library links. Test: Presubmit boot test Bug: 120786417 Bug: 134659294 Change-Id: I362e0e67c5adfd510dda12bed52629af92bfcc3d --- rootdir/etc/ld.config.legacy.txt | 2 +- rootdir/etc/ld.config.txt | 6 +++--- rootdir/etc/ld.config.vndk_lite.txt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rootdir/etc/ld.config.legacy.txt b/rootdir/etc/ld.config.legacy.txt index f6b5e9582..ad1449389 100644 --- a/rootdir/etc/ld.config.legacy.txt +++ b/rootdir/etc/ld.config.legacy.txt @@ -56,7 +56,7 @@ 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 +# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat. namespace.default.link.runtime.shared_libs += libicui18n.so namespace.default.link.runtime.shared_libs += libicuuc.so namespace.default.link.runtime.shared_libs += libnativebridge.so diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 6c4f8abdb..3b3f61ef6 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -135,7 +135,7 @@ 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 +# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat. namespace.default.link.runtime.shared_libs += libicui18n.so namespace.default.link.runtime.shared_libs += libicuuc.so namespace.default.link.runtime.shared_libs += libnativebridge.so @@ -522,7 +522,7 @@ 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 +# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat. namespace.system.link.runtime.shared_libs += libicui18n.so namespace.system.link.runtime.shared_libs += libicuuc.so namespace.system.link.runtime.shared_libs += libnativebridge.so @@ -607,7 +607,7 @@ 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 +# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat. namespace.default.link.runtime.shared_libs += libicui18n.so namespace.default.link.runtime.shared_libs += libicuuc.so namespace.default.link.runtime.shared_libs += libnativebridge.so diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index d616582d6..0880be0f5 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -75,7 +75,7 @@ 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 +# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat. namespace.default.link.runtime.shared_libs += libicui18n.so namespace.default.link.runtime.shared_libs += libicuuc.so namespace.default.link.runtime.shared_libs += libnativebridge.so @@ -366,7 +366,7 @@ 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 +# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat. namespace.default.link.runtime.shared_libs += libicui18n.so namespace.default.link.runtime.shared_libs += libicuuc.so namespace.default.link.runtime.shared_libs += libnativebridge.so @@ -419,7 +419,7 @@ 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 +# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat. namespace.default.link.runtime.shared_libs += libicui18n.so namespace.default.link.runtime.shared_libs += libicuuc.so namespace.default.link.runtime.shared_libs += libnativebridge.so