Fix libicu.so missing in general-tests.zip
The libs under host/testcases/art_common/out/host/linux-x86/lib64/
in general-tests are generated by the art_common module in
Android.gtest.mk.
On host, the correct lib name is not libicu-host.so, but libicu.so, because
unique_host_name is false in the libicu Soong module. This CL corrects
the .so name in the art_common module.
Bug: 160350521
Test: Verified the libicu.so exists in general-tests.zip
Change-Id: I11c9618db88635e8b7569fc592694b2d6c9bd52e
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 2eec949..ac12c10 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -25,11 +25,11 @@
# Manually add system libraries that we need to run the host ART tools.
my_files += \
- $(foreach lib, libbacktrace libbase libc++ libicu_jni liblog libsigchain libunwindstack \
+ $(foreach lib, libbacktrace libbase libc++ libicu libicu_jni liblog libsigchain libunwindstack \
libziparchive libjavacore libandroidio libopenjdkd liblz4 liblzma, \
$(call intermediates-dir-for,SHARED_LIBRARIES,$(lib),HOST)/$(lib).so:lib64/$(lib).so \
$(call intermediates-dir-for,SHARED_LIBRARIES,$(lib),HOST,,2ND)/$(lib).so:lib/$(lib).so) \
- $(foreach lib, libcrypto libz libicu libicuuc libicui18n libexpat, \
+ $(foreach lib, libcrypto libz libicuuc libicui18n libexpat, \
$(call intermediates-dir-for,SHARED_LIBRARIES,$(lib),HOST)/$(lib).so:lib64/$(lib)-host.so \
$(call intermediates-dir-for,SHARED_LIBRARIES,$(lib),HOST,,2ND)/$(lib).so:lib/$(lib)-host.so)