Revert "Remove duplicate entries in shared_libs"

This reverts commit 28ea47a3102a8cfd44d3e9315a18cae3ecb15287.

Reason for revert: b/157742728 (performance regression)

Change-Id: I3d925814afa2c7a8ac86e1dc5a5c46800f3e03ee

1 files changed, 23 insertions, 46 deletions

diff --git a/testdata/golden_output/stage2/com.android.runtime/ld.config.txt b/testdata/golden_output/stage2/com.android.runtime/ld.config.txt
index 3a40c4c..29c727e 100644
--- a/testdata/golden_output/stage2/com.android.runtime/ld.config.txt
+++ b/testdata/golden_output/stage2/com.android.runtime/ld.config.txt
@@ -9,19 +9,12 @@ namespace.default.asan.search.paths = /apex/com.android.runtime/${LIB}
 namespace.default.asan.permitted.paths = /apex/com.android.runtime/${LIB}
 namespace.default.asan.permitted.paths += /system/${LIB}
 namespace.default.links = system
-namespace.default.link.system.shared_libs = libc.so
-namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so
-namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so
-namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so
-namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so
-namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so
-namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so
-namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so
-namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so
+namespace.default.link.system.shared_libs = liblog.so
+namespace.default.link.system.shared_libs += libc.so
 namespace.default.link.system.shared_libs += libdl.so
 namespace.default.link.system.shared_libs += libdl_android.so
-namespace.default.link.system.shared_libs += liblog.so
 namespace.default.link.system.shared_libs += libm.so
+namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.com_android_adbd.isolated = true
 namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB}
 namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB}
@@ -32,18 +25,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB}
 namespace.com_android_adbd.links = system
 namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so
 namespace.com_android_adbd.link.system.shared_libs += libc.so
-namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so
-namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so
-namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so
-namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so
-namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so
-namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so
-namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so
-namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so
 namespace.com_android_adbd.link.system.shared_libs += libdl.so
-namespace.com_android_adbd.link.system.shared_libs += libdl_android.so
 namespace.com_android_adbd.link.system.shared_libs += liblog.so
 namespace.com_android_adbd.link.system.shared_libs += libm.so
+namespace.com_android_adbd.link.system.shared_libs += libc.so
+namespace.com_android_adbd.link.system.shared_libs += libdl.so
+namespace.com_android_adbd.link.system.shared_libs += libdl_android.so
+namespace.com_android_adbd.link.system.shared_libs += libm.so
+namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.com_android_art.isolated = true
 namespace.com_android_art.visible = true
 namespace.com_android_art.search.paths = /apex/com.android.art/${LIB}
@@ -75,18 +64,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB}
 namespace.com_android_i18n.asan.permitted.paths += /system/${LIB}
 namespace.com_android_i18n.links = system
 namespace.com_android_i18n.link.system.shared_libs = libc.so
-namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so
-namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so
-namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so
-namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so
-namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so
-namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so
-namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so
-namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so
 namespace.com_android_i18n.link.system.shared_libs += libdl.so
-namespace.com_android_i18n.link.system.shared_libs += libdl_android.so
 namespace.com_android_i18n.link.system.shared_libs += liblog.so
 namespace.com_android_i18n.link.system.shared_libs += libm.so
+namespace.com_android_i18n.link.system.shared_libs += libc.so
+namespace.com_android_i18n.link.system.shared_libs += libdl.so
+namespace.com_android_i18n.link.system.shared_libs += libdl_android.so
+namespace.com_android_i18n.link.system.shared_libs += libm.so
+namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.com_android_neuralnetworks.isolated = true
 namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB}
 namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB}
@@ -97,21 +82,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB}
 namespace.com_android_neuralnetworks.links = system
 namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so
 namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so
-namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so
-namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so
-namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so
-namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so
-namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so
-namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so
-namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so
-namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so
 namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so
-namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so
 namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so
 namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so
 namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so
 namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so
 namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so
+namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so
+namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so
+namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so
+namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so
+namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.com_android_os_statsd.isolated = true
 namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB}
 namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB}
@@ -122,19 +103,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB}
 namespace.com_android_os_statsd.links = system,com_android_art
 namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so
 namespace.com_android_os_statsd.link.system.shared_libs += libc.so
-namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so
-namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so
-namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so
-namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so
-namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so
-namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so
-namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so
-namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so
 namespace.com_android_os_statsd.link.system.shared_libs += libdl.so
-namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so
 namespace.com_android_os_statsd.link.system.shared_libs += libincident.so
 namespace.com_android_os_statsd.link.system.shared_libs += liblog.so
 namespace.com_android_os_statsd.link.system.shared_libs += libm.so
+namespace.com_android_os_statsd.link.system.shared_libs += libc.so
+namespace.com_android_os_statsd.link.system.shared_libs += libdl.so
+namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so
+namespace.com_android_os_statsd.link.system.shared_libs += libm.so
+namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so
 namespace.system.isolated = true
 namespace.system.visible = true