From b4f4c16d32a6734f163a59cfa404536501d882fb Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 12 Sep 2016 14:37:02 -0700 Subject: [PATCH] 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 --- engine/src/flutter/app/Android.mk | 2 +- engine/src/flutter/libs/minikin/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/src/flutter/app/Android.mk b/engine/src/flutter/app/Android.mk index 2038683027..23305b7b4c 100644 --- a/engine/src/flutter/app/Android.mk +++ b/engine/src/flutter/app/Android.mk @@ -28,7 +28,7 @@ LOCAL_STATIC_LIBRARIES := libminikin_host LOCAL_SHARED_LIBRARIES := \ liblog \ - libicuuc-host + libicuuc LOCAL_SRC_FILES += \ HyphTool.cpp diff --git a/engine/src/flutter/libs/minikin/Android.mk b/engine/src/flutter/libs/minikin/Android.mk index 9d8257944f..d6c3df7f62 100644 --- a/engine/src/flutter/libs/minikin/Android.mk +++ b/engine/src/flutter/libs/minikin/Android.mk @@ -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