commit 9ab50a1e28b965f34f792c9b4bc1a00abbb76644
author android-build-team Robot <android-build-team-robot@google.com> Sun Dec 23 04:06:55 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Dec 23 04:06:55 2018 +0000
tree 4566f17f78ac9285ea84d3d3247069201bc4f5f8
parent d315385e497a8264b99e871c9f68cc0e262479b0
parent da24b81736b03ff57aaa00b202730556484e301a

Snap for 5198681 from da24b81736b03ff57aaa00b202730556484e301a to qt-release

Change-Id: I8e841fc4528c374610d7e4986876e0c30fd78bf1

Android.mk

diff --git a/Android.mk b/Android.mk
index c89e0b9..8abe384 100644
--- a/Android.mk
+++ b/Android.mk
@@ -85,6 +85,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 += -DTC3_TEST_DATA_DIR="\"/data/nativetest/libtextclassifier_tests/test_data/\""
 LOCAL_CPPFLAGS_64 += -DTC3_TEST_DATA_DIR="\"/data/nativetest64/libtextclassifier_tests/test_data/\""
 
@@ -109,6 +111,8 @@
 
 LOCAL_TEST_DATA := $(call find-test-data-in-subdirs, $(LOCAL_PATH), *, annotator/test_data, actions/test_data)
 
+# TODO(b/119788152): Remove this when the bug is fixed
+LOCAL_CFLAGS += -DANDROID_LINK_SHARED_ICU4C
 LOCAL_CPPFLAGS_32 += -DTC3_TEST_DATA_DIR="\"/data/nativetest/libtextclassifier_tests/test_data/\""
 LOCAL_CPPFLAGS_64 += -DTC3_TEST_DATA_DIR="\"/data/nativetest64/libtextclassifier_tests/test_data/\""