commit 3e4eaf7a5e90340bb94b344b7d5e5311aafab9b5
author Victor Chang <vichang@google.com> Mon Dec 24 03:57:48 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 24 03:57:48 2018 -0800
tree ca3dc9f794c15bd843c9fc925c0a555d73114267
parent a8f81e51fc12fe38c245d8f43d77e1d2b686a664
parent aee00a6f68542fd702e1e678473eeeee09e3f826

Add ANDROID_LINK_SHARED_ICU4C flag am: a33e97ce26
am: aee00a6f68

Change-Id: I1253bd5c8c6e9b88f7ed28891939eef3034d81d8

Android.mk

diff --git a/Android.mk b/Android.mk
index 4e5bbf5..fc3ffb0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -89,6 +89,8 @@
 
 LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/jni.lds
 LOCAL_LDFLAGS += -Wl,-version-script=$(LOCAL_PATH)/jni.lds
+# TODO(b/119788152): Remove this when the bug is fixed
+LOCAL_CFLAGS += -DANDROID_LINK_SHARED_ICU4C
 LOCAL_CPPFLAGS_32 += -DLIBTEXTCLASSIFIER_TEST_DATA_DIR="\"/data/nativetest/libtextclassifier_tests/test_data/\""
 LOCAL_CPPFLAGS_64 += -DLIBTEXTCLASSIFIER_TEST_DATA_DIR="\"/data/nativetest64/libtextclassifier_tests/test_data/\""
 
@@ -110,6 +112,8 @@
 
 LOCAL_TEST_DATA := $(call find-test-data-in-subdirs, $(LOCAL_PATH), *, test_data)
 
+# TODO(b/119788152): Remove this when the bug is fixed
+LOCAL_CFLAGS += -DANDROID_LINK_SHARED_ICU4C
 LOCAL_CPPFLAGS_32 += -DLIBTEXTCLASSIFIER_TEST_DATA_DIR="\"/data/nativetest/libtextclassifier_tests/test_data/\""
 LOCAL_CPPFLAGS_64 += -DLIBTEXTCLASSIFIER_TEST_DATA_DIR="\"/data/nativetest64/libtextclassifier_tests/test_data/\""