summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-03-19 09:17:25 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-19 09:17:26 +0000
commit2254ea8858e26ed402a297f4c97448abb76fdabd (patch)
tree057696fa28e87be974fc4cdcbd79127335b5a8f6
parent7417225fe4bdec82cc1cd1c2c8a48077a9c99b95 (diff)
parent1b9b1c8e53a4610438d597fc21d8a147092d05fd (diff)
downloadlibcore-2254ea8858e26ed402a297f4c97448abb76fdabd.zip
libcore-2254ea8858e26ed402a297f4c97448abb76fdabd.tar.gz
libcore-2254ea8858e26ed402a297f4c97448abb76fdabd.tar.bz2
Merge "Set -Wno-deprecated-declarations to access deprecated IDNA2003 API."
-rw-r--r--luni/src/main/native/sub.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/luni/src/main/native/sub.mk b/luni/src/main/native/sub.mk
index da866a6..cf2118a 100644
--- a/luni/src/main/native/sub.mk
+++ b/luni/src/main/native/sub.mk
@@ -64,3 +64,6 @@ LOCAL_STATIC_LIBRARIES += \
LOCAL_SHARED_LIBRARIES += \
liblog \
libnativehelper \
+
+# Workaround to let libcore_icu_NativeIDN.cpp use the deprecated IDNA2003 API:
+LOCAL_CFLAGS += -Wno-deprecated-declarations