diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-11 10:45:11 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-12-11 11:07:05 -0800 |
| commit | 5d613ba28ce3da1287efdd4a875fcdecb66afedd (patch) | |
| tree | de198e152f1425e22f39674e3bae2367838f9bf7 | |
| parent | 5bd2815f627e62404daaea149cf5fb6e0efc8be4 (diff) | |
| download | icu-lollipop-wear-release.tar.gz | |
Remove obsolete Android-specific hacks.android-wear-5.0.0_r1lollipop-wear-release
We do have std::string, so there's no reason to pretend otherwise.
We don't have <langinfo.h>, but upstream icu4c already knows that.
Also silence various false-positive compile warnings.
Change-Id: Ic49fc0494ea2d775558d178e170e0e0ef2ef9f6a
| -rw-r--r-- | icu4c/source/common/Android.mk | 5 | ||||
| -rw-r--r-- | icu4c/source/common/unicode/platform.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/icu4c/source/common/Android.mk b/icu4c/source/common/Android.mk index 85e25d1c4..7292e86a4 100644 --- a/icu4c/source/common/Android.mk +++ b/icu4c/source/common/Android.mk @@ -132,14 +132,13 @@ c_includes := \ local_cflags := '-DICU_DATA_DIR_PREFIX_ENV_VAR="ANDROID_ROOT"' local_cflags += '-DICU_DATA_DIR="/usr/icu"' -# bionic doesn't have <langinfo.h>. -local_cflags += -DU_HAVE_NL_LANGINFO_CODESET=0 - local_cflags += -D_REENTRANT local_cflags += -DU_COMMON_IMPLEMENTATION local_cflags += -O3 -fvisibility=hidden +local_cflags += -Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare + # # Build for the target (device). # diff --git a/icu4c/source/common/unicode/platform.h b/icu4c/source/common/unicode/platform.h index 27e6b29d5..b930bd6aa 100644 --- a/icu4c/source/common/unicode/platform.h +++ b/icu4c/source/common/unicode/platform.h @@ -335,8 +335,6 @@ */ #ifdef U_HAVE_STD_STRING /* Use the predefined value. */ -#elif U_PLATFORM == U_PF_ANDROID -# define U_HAVE_STD_STRING 0 #else # define U_HAVE_STD_STRING 1 #endif |