diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-24 18:31:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-24 18:31:37 +0000 |
| commit | 5752fa286a3b6d8e0ab856411c116a16af18396b (patch) | |
| tree | 80a8762b5c3d6445f22d2195bfe1d346daffbb28 | |
| parent | 74c855c7acdc1d375f9091e4e6e97cf8e5a4340c (diff) | |
| parent | 690a1de1dc8cee61c822c44c88f88fd6f66c4668 (diff) | |
| download | icu-5752fa286a3b6d8e0ab856411c116a16af18396b.tar.gz | |
Merge "Android patch: Disable experimental MF2 in icu4c" into main
| -rw-r--r-- | icu4c/source/common/unicode/uconfig.h | 3 | ||||
| -rw-r--r-- | libandroidicu/include/unicode/uconfig.h | 3 | ||||
| -rw-r--r-- | libicu/cts_headers/unicode/uconfig.h | 3 | ||||
| -rw-r--r-- | libicu/ndk_headers/unicode/uconfig.h | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/icu4c/source/common/unicode/uconfig.h b/icu4c/source/common/unicode/uconfig.h index 4a6d1a4d8..8017f3079 100644 --- a/icu4c/source/common/unicode/uconfig.h +++ b/icu4c/source/common/unicode/uconfig.h @@ -434,7 +434,8 @@ * @deprecated This API is for technology preview only. */ #ifndef UCONFIG_NO_MF2 -# define UCONFIG_NO_MF2 0 +// Android patch: Disable experimental MF2 on Android. +# define UCONFIG_NO_MF2 1 #endif /** diff --git a/libandroidicu/include/unicode/uconfig.h b/libandroidicu/include/unicode/uconfig.h index 4a6d1a4d8..8017f3079 100644 --- a/libandroidicu/include/unicode/uconfig.h +++ b/libandroidicu/include/unicode/uconfig.h @@ -434,7 +434,8 @@ * @deprecated This API is for technology preview only. */ #ifndef UCONFIG_NO_MF2 -# define UCONFIG_NO_MF2 0 +// Android patch: Disable experimental MF2 on Android. +# define UCONFIG_NO_MF2 1 #endif /** diff --git a/libicu/cts_headers/unicode/uconfig.h b/libicu/cts_headers/unicode/uconfig.h index 4a6d1a4d8..8017f3079 100644 --- a/libicu/cts_headers/unicode/uconfig.h +++ b/libicu/cts_headers/unicode/uconfig.h @@ -434,7 +434,8 @@ * @deprecated This API is for technology preview only. */ #ifndef UCONFIG_NO_MF2 -# define UCONFIG_NO_MF2 0 +// Android patch: Disable experimental MF2 on Android. +# define UCONFIG_NO_MF2 1 #endif /** diff --git a/libicu/ndk_headers/unicode/uconfig.h b/libicu/ndk_headers/unicode/uconfig.h index b21e68868..025fe3830 100644 --- a/libicu/ndk_headers/unicode/uconfig.h +++ b/libicu/ndk_headers/unicode/uconfig.h @@ -434,7 +434,8 @@ * \xrefitem deprecated "Deprecated" "Deprecated List" This API is for technology preview only. */ #ifndef UCONFIG_NO_MF2 -# define UCONFIG_NO_MF2 0 +// Android patch: Disable experimental MF2 on Android. +# define UCONFIG_NO_MF2 1 #endif /** |