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: Ic38499bb236ace75333a84f23798af023e14cf5f
This commit is contained in:
Dan Willemsen 2016-09-12 14:37:02 -07:00
parent 8402f2eee8
commit ccfc696dfc
2 changed files with 2 additions and 2 deletions

View File

@ -28,7 +28,7 @@ LOCAL_STATIC_LIBRARIES := libminikin_host
LOCAL_SHARED_LIBRARIES := \
liblog \
libicuuc-host
libicuuc
LOCAL_SRC_FILES += \
HyphTool.cpp

View File

@ -109,7 +109,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include
LOCAL_C_INCLUDES := $(minikin_c_includes)
LOCAL_CPPFLAGS += -Werror -Wall -Wextra $(enable_race_detection)
LOCAL_SHARED_LIBRARIES := liblog libicuuc-host
LOCAL_SHARED_LIBRARIES := liblog libicuuc
LOCAL_SRC_FILES := Hyphenator.cpp