summaryrefslogtreecommitdiffstats
path: root/icu4c
diff options
context:
space:
mode:
authorFredrik Roubert <roubert@google.com>2015-03-02 22:12:10 +0100
committerFredrik Roubert <roubert@google.com>2015-03-19 18:00:10 +0100
commit57751605fe600a4da709ea71ed581eb262ccb5fe (patch)
tree9dc23f0a97875f89af51c1a63692985ad7a4bb7f /icu4c
parentb160e79c1fdeb76d80c658dd44e7367a48e7c93b (diff)
downloadandroid_external_icu-57751605fe600a4da709ea71ed581eb262ccb5fe.tar.gz
android_external_icu-57751605fe600a4da709ea71ed581eb262ccb5fe.tar.bz2
android_external_icu-57751605fe600a4da709ea71ed581eb262ccb5fe.zip
Android patch: Add exceptions for big5han and gb2312han in genrb.
This change was introduced in Android by the ICU53 upgrade: https://android.googlesource.com/platform/external/icu/+/fceb398 Change-Id: I91757493db178fe57e5d6cb82a6f09589e5fe7dc
Diffstat (limited to 'icu4c')
-rw-r--r--icu4c/source/tools/genrb/parse.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/icu4c/source/tools/genrb/parse.cpp b/icu4c/source/tools/genrb/parse.cpp
index 95386dea5..06c513c5d 100644
--- a/icu4c/source/tools/genrb/parse.cpp
+++ b/icu4c/source/tools/genrb/parse.cpp
@@ -1086,7 +1086,11 @@ addCollation(ParseState* state, struct SResource *result, const char *collation
}
static UBool
-keepCollationType(const char * /*type*/) {
+keepCollationType(const char *type) { // android-changed
+ // BEGIN android-added
+ if (uprv_strcmp(type, "big5han") == 0) { return FALSE; }
+ if (uprv_strcmp(type, "gb2312han") == 0) { return FALSE; }
+ // END android-added
return TRUE;
}