From 690a1de1dc8cee61c822c44c88f88fd6f66c4668 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Wed, 24 Apr 2024 14:26:05 +0100 Subject: Android patch: Disable experimental MF2 in icu4c It's based on the feedback from https://r.android.com/3048640 and it should have no user on Android. It should save some binary size as well. Test: m droid Change-Id: I030e143c60336b1d0cb47ecba0deb97d410ba386 --- icu4c/source/common/unicode/uconfig.h | 3 ++- libandroidicu/include/unicode/uconfig.h | 3 ++- libicu/cts_headers/unicode/uconfig.h | 3 ++- 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 /** -- cgit v1.2.3