diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-09-13 03:47:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-13 03:47:02 +0000 |
| commit | 00b9a21209f6a9117f4915eb3fc074564e21aadd (patch) | |
| tree | ffe620bdde05ce1f7f8dc9e6b557bb210ee0689a | |
| parent | 6261d824595d3590b5355d8dea80949769d8e38e (diff) | |
| parent | ccfc696dfc91d045271e0b2f92da90d2579a65df (diff) | |
| download | minikin-00b9a21209f6a9117f4915eb3fc074564e21aadd.tar.gz | |
Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n"android-n-mr1-preview-2android-n-mr1-preview-1
| -rw-r--r-- | app/Android.mk | 2 | ||||
| -rw-r--r-- | libs/minikin/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/Android.mk b/app/Android.mk index 2038683..23305b7 100644 --- a/app/Android.mk +++ b/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/libs/minikin/Android.mk b/libs/minikin/Android.mk index 9d82579..d6c3df7 100644 --- a/libs/minikin/Android.mk +++ b/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 |