commit eeb436f36a2d58be927b4f0f09f9d9078db6c1c2
author Dan Willemsen <dwillemsen@google.com> Mon Sep 12 14:33:43 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Mon Sep 12 14:33:51 2016 -0700
tree 8072b440f4b9504c4b56b69c6a9054dc53d51c1c
parent 47b451546d1a5c0fbb5e3816373395762a736515

Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n

These modules can be named the same between the target and host
libraries, which simplifies references to them, particularly in
Soong.

To prevent accidentally loading the system copy of the library,
we still rename the installed name to be libicu*-host.so. But
modules do not need to know that in order to build against them.

Change-Id: Iede535d884a4b230ac511bae0d1687133f5801fe

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 8a6d52d..4a29c18 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -694,7 +694,7 @@
     LOCAL_CLANG := $$(ART_HOST_CLANG)
     LOCAL_CFLAGS += $$(ART_HOST_CFLAGS) $$(ART_HOST_DEBUG_CFLAGS)
     LOCAL_ASFLAGS += $$(ART_HOST_ASFLAGS) $$(ART_HOST_DEBUG_ASFLAGS)
-    LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libziparchive libz-host libvixld-arm libvixld-arm64
+    LOCAL_SHARED_LIBRARIES += libicuuc libicui18n libnativehelper libziparchive libz-host libvixld-arm libvixld-arm64
     LOCAL_LDLIBS := -lpthread -ldl
     LOCAL_IS_HOST_MODULE := true
     LOCAL_MULTILIB := both