summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-19Android patch: Add '--small' option to makeconv call during .ucm to .cnv ↵Victor Chang
conversion This change was introduced in Android by the ICU421 and ICU4.6 upgrades: https://android.googlesource.com/platform/external/icu/+/85bf2e2 https://android.googlesource.com/platform/external/icu/+/27f6547 In ICU 64 build system has changed, migrating from Makefile to python script when performing various data transformations, so that patch now patches BUILDRULES.py and adds '--small' option there. Test: n/a Change-Id: I75a0b20fb87e34e8f8c22ebee87eb6f4fbc0a8d6
2024-03-19Android patch: CLDR data: Skip tests for the XA/XB pseudo locales.Victor Chang
In ICU 68, icu4c/source/data/icu-config.xml is removed. This CL adds pseudo locales used in some tests and excludes them from com.ibm.icu.dev.test.format.DateTimeGeneratorTest#testJjMapping because they are not real locales. https://android.googlesource.com/platform/external/icu/+/338b5d35fdb86a9c4cb0ed59a67416693a0fe1e4 In ICU 74, LocaleDataTest.java and cldrtest.c are also patched. https://r.android.com/3000472 Test: n/a Change-Id: Ic5eed3844191fca4e221d0c3c2661483e2bda95f
2024-03-19Android patch: CLDR data: Replace nb with no.Victor Chang
This change was introduced in Android by the ICU51.1 upgrade: https://android.googlesource.com/platform/external/icu/+/8393335 And then amended for ICU 57: https://android.googlesource.com/platform/external/icu/+/7dbcff1 And then amended for ICU 68: Amend the test data in cloctst.c These changes have been proposed, but not yet made, to CLDR: https://unicode.org/cldr/trac/ticket/2698 Test: n/a Change-Id: I2dfd989683d013c18c89e6469da2ef28f4e41d4a
2024-03-19Android patch: Skip charset tests that fail with customized data.Victor Chang
Suppression of ICU4C test failures was added by the ICU 51 upgrade: https://android.googlesource.com/platform/external/icu/+/8393335 Suppression of ICU4J test failures was added for ICU 55: https://android.googlesource.com/platform/external/icu/+/3db47ed It was then partially reverted for the O release: https://android.googlesource.com/platform/external/icu/+/b48a108 (cherry picked from commit 630aab079a3a1393e8535367ec7ec86822646437) Test: n/a Change-Id: I78d8c896400e73ac19a379e0de3ed0ce7de1a726
2024-03-19Android patch: convrtrs.txt: JavaUnicode customizations.Victor Chang
This change was introduced in Android by the ICU421 and ICU4.6 upgrades: https://android.googlesource.com/platform/external/icu/+/85bf2e2 https://android.googlesource.com/platform/external/icu/+/27f6547 (cherry picked from commit f8387513469806088e05f3807ceec1d4d2466199) Test: n/a Change-Id: I0a70196acea16a4c98d29b9ab32d9d5715084979
2024-03-19Android patch: convrtrs.txt: Thai customizations.Victor Chang
This change was introduced in Android by the ICU 42 upgrade: https://android.googlesource.com/platform/external/icu/+/85bf2e2 It was then amended for ICU 56: https://android.googlesource.com/platform/external/icu/+/cf220d4 (cherry picked from commit b8e12828dcc44d284db517d68999218520695b4c) Test: n/a Change-Id: I1f43f6a5445ff3371d6c14ae3a0e0d6a675d782a
2024-03-19Android patch: convrtrs.txt: CJK customizations.Victor Chang
This change was introduced in Android by these patches: https://android.googlesource.com/platform/external/icu/+/861020f https://android.googlesource.com/platform/external/icu/+/037e0a4 (cherry picked from commit f2f318493f4928b93726d0d9ae791e0a9b7b452b) Test: n/a Change-Id: I5094ddaefd4b7c81cc9ce24e62544e2247d969d2
2024-03-19Android patch: Add noop-*.ucm to prevent 2022 security attack.Victor Chang
This change was introduced in Android by this patch: https://android.googlesource.com/platform/external/icu/+/e53684e And then amended by the ICU4.4.1 and ICU51.1 upgrades: https://android.googlesource.com/platform/external/icu/+/ea1f181 https://android.googlesource.com/platform/external/icu/+/8393335 https://android.googlesource.com/platform/external/icu/+/1075f69 https://android.googlesource.com/platform/external/icu/+/59d709d (cherry picked from commit bcf29ec1a5965a72d04a9385d4ff2a627528c121) Test: n/a Change-Id: Ib7ff82a91c319312fbb24212ab3196841b975a0e
2024-03-19Android patch: Add --omitCollationRules to genrb.Victor Chang
This change was introduced in Android by the ICU 54.1 upgrade: https://android.googlesource.com/platform/external/icu/+/f9878a2 Changing ICU4J test errors into warnings was introduced for ICU 55: https://android.googlesource.com/platform/external/icu/+/0543b35 Changing ICU4C test errors into log messages is new for ICU 57. https://android.googlesource.com/platform/external/icu/+/805390a In ICU 64 build system has changed, migrating from Makefile to python script when performing various data transformations, so that patch now patches BUILDRULES.py and adds '--omitCollationRules' option there. Test: n/a Change-Id: I4b75936aa31111434c6b46bfb354e6842e9d22a9
2024-03-19Android patch: Add Calendar.getDateTimeFormatString used by java.time via ↵Victor Chang
libcore bridge Add Calendar.getDateTimeFormatString needed by java.time. It tends to expose functionality that most end user code will not need, but allows access to ICU internal data or functionality that should be shared between ICU and java.time. - Add method to Calendar to get localized pattern string. This change was introduced in Android for the O release: https://android.googlesource.com/platform/external/icu/+/22b47ef It was then amended to remove DateFormatSymbols(ULocale, String) constructor in ICU 69, because no one is using it. https://r.android.com/q/I1d65bca1c301b5e13e265062c9eeab1196edb516 The implementation of Calendar.getDateTimeFormatString() is updated to match the new upstream internal changes. https://r.android.com/2292158 Test: n/a Change-Id: Id79ebf4cbe164ea5f4aee1c686f01d7ebec6e9e3
2024-03-19Copy ICU release-74-2 into aosp/icu-stagingVictor Chang
Copy the files with the following commands: find icu4j/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|adjust_icudt_path.mk\|liblayout-jarjar-rules.txt\|.gitignore\|AndroidTest.xml\)" -delete find icu4c/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|.gitignore\|AndroidTest.xml\)" -delete cp -r ${UPSTREAM_ICU_GIT}/icu4j . cp -r ${UPSTREAM_ICU_GIT}/icu4c . git checkout HEAD -- icu4c/.gitignore icu4j/.gitignore rm -r tools/cldr cp -r ${UPSTREAM_ICU_GIT}/tools/cldr tools/cldr Test: n/a Change-Id: Ie2e5e1aab314506ac7f1e5869eeede39c46cb21f
2024-03-18Merge remote-tracking branch 'aosp/main' into icu-stagingVictor Chang
Test: n/a Change-Id: I92d0a3cc72e72c5a841514bd99023097071a4eca
2024-03-15Snap for 11582845 from d1c8f039fccdc5a273509e55cbd542af1f501b3d to ↵Android Build Coastguard Worker
build-tools-release Change-Id: Ib22b7c35bea50d96488d1b96e8a08fabb311a9ac
2024-03-11Merge "Android patch: Soft removal of Calendar.BASE_FIELD_COUNT" into mainTreehugger Robot
2024-03-11Merge "Deprecate UnicodeSet.CASE" into mainTreehugger Robot
2024-03-08Android patch: Soft removal of Calendar.BASE_FIELD_COUNTVictor Chang
The field has been deprecated since API level 26. This CL should remove the field from the SDK, and we expect no one uses the field in the runtime, as javac normally inlines the value in the build time before this change. Bug: 312171264 Test: m droid Change-Id: I674da9c7f01ee1839bd9b06aaa3fb657cb001869
2024-03-08Export flags used in FlaggedApi annotationsOriol Prieto Gasco
Before calling a flagged API, client code must check the value of the flag which gates it. Those flags must be exported in order to be accessible from containers other than the container where the flag and the API are hosted. Bug: 320984775 Bug: 322839671 Test: m all_aconfig_declarations Test: printflags --format='{fully_qualified_name}:{is_exported}' | grep true Change-Id: I06ae839e2d62488e9bc4603f58b5782b4a13e4b0
2024-03-08Deprecate UnicodeSet.CASEVictor Chang
The constant is deprecated in ICU 73. Bug: 312171264 Test: m droid Change-Id: Id7a8c698ad1c89bea1a9577f094e3863137d7d57
2024-03-07Merge "Remove unused Android.mk" into mainTreehugger Robot
2024-03-04[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [SC_V2 CTS] am: ↵Almaz Mingaleev
9c14af3c90 -s ours am: 25d9d020f2 -s ours am: 1117be9642 -s ours am: bead24001c -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2985516 Change-Id: I6c94df67dfde715afee71a712375722229d28539 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-04[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [SC_V2 CTS] am: ↵Almaz Mingaleev
9c14af3c90 -s ours am: 25d9d020f2 -s ours am: 1117be9642 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2985516 Change-Id: Ia9317605c147fe661153ed901698d49da9929470 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-04[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [SC_V2 CTS] am: ↵Almaz Mingaleev
9c14af3c90 -s ours am: 25d9d020f2 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2985516 Change-Id: I9f42f1e74e6b9c2f08987dbd1831287e00457356 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-04[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [SC_V2 CTS] am: ↵Almaz Mingaleev
9c14af3c90 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2985516 Change-Id: I7b7c2bf32b043e1ed8a479847add051f6fb78211 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-04DO NOT MERGE Track tzdb 2023d update. [SC_V2 CTS]Almaz Mingaleev
TimeZoneTest#TestCanonicalID was already marked as ignored, only comment was added / updated. TestLocalValidity: ignoring test case added on aosp/main as it will fail with older tzdata-s. Not ignoring it completely as it is easy to keep the test working regardless of the installed tzdata. Bug: 324052859 Test: run cts -m CtsIcuTestCases -t android.icu.dev.test.format.TimeZoneFormatTest Test: and Test: run cts -m CtsIcuTestCases -t android.icu.dev.test.timezone.TimeZoneTest Test: on ab/11461191 (2022a) instance. Change-Id: Iaa6859d792626a0f5b3ce1b92521b380421c52ab Merged-In: Iaa6859d792626a0f5b3ce1b92521b380421c52ab
2024-02-29Removed inactive owners am: 139e25aabbVictor Chang
Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2982234 Change-Id: Ifbb233c5867d0417cf7f4a1b51dc926484ac9ec9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29Removed inactive ownersVictor Chang
Test: n/a Change-Id: I49fbcb866a8026a3d318add41bdc6bc36e5a8811
2024-02-29Remove unused Android.mkyangbill
There's no other Android.mk under subdirectory, remove it directly for the conversion. Bug: 327555918 Test: m nothing Test: cd external/icu ; mma Change-Id: I7082d2aa6fa46126a3804ceea0d9e20fb78e814a
2024-02-27Merge remote-tracking branch 'aosp/main' into icu-stagingVictor Chang
Bug: 327164201 Test: n/a Change-Id: I6fa62cb99f33eddc6bb229f34c35bb27cf378f8d
2024-02-26Rename last api file providing filegroup modulesJihoon Kang
The last api file filegroup modules are implicitly referenced in the droidstubs modules generated by the java_sdk_library. However, the droidstubs modules now depend on the "combined" modules which are generated from the "prebuilt_apis" type "sdk" module. Given that the droidstubs find the last api file modules by module name, these modules are also renamed to match the "combined" name pattern. Test: m nothing Bug: 321827591 Change-Id: I42b453a91849e139ff87200cd503d2efdb2a568e
2024-02-22Remove unnecessary final modifier from enum methods am: 603c71a7dcPaul Duffin
Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2973511 Change-Id: I30ded093ca29e94cf26adb0a6593853481187ea1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22Remove unnecessary final modifier from enum methodsPaul Duffin
Metalava removes `final` modifier from methods in `final` classes to normalize the model, and ensure consistency as historically the underlying Java/Kotlin parsing code was inconsistent in how it handled implicit or inherited modifiers. Unfortunately, due to a bug in Metalava that normalization was not applied to methods in an `enum` class (which is itself implicitly `final`). That bug has been fixed and this is updating the few places where that affected these signature files. Bug: 326310840 Test: m checkapi Change-Id: Ie1b6486b0416f0f2fcb1430ec11da916c671bf56
2024-02-21Merge "Add "-Wno-tautological-negation-compare"" into main am: 449c160c88Aditya Kumar
Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2967743 Change-Id: Ib4c4aec7d45779b0b257215341ce25841c9dac89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21Merge "Add "-Wno-tautological-negation-compare"" into mainAditya Kumar
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [Q CTS] am: ↵Almaz Mingaleev
c4f7385936 -s ours am: 0883de6a83 -s ours am: 4e4b803b0d -s ours am: 1231038eda -s ours am: af1da94306 -s ours am: ecfa387c5a -s ours am: 70fcfaaa10 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2967636 Change-Id: I3dcd276838778c9a39c6fd2206b1db31a38326b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [R CTS] am: ↵Almaz Mingaleev
0a6122ecc0 -s ours am: b4049fa722 -s ours am: 34192561cd -s ours am: 736cd54e36 -s ours am: 57dfd44017 -s ours am: 4c7418ad5c -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2966701 Change-Id: I63f50101782caf23400dae7462846b2477e23495 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [Q CTS] am: ↵Almaz Mingaleev
c4f7385936 -s ours am: 0883de6a83 -s ours am: 4e4b803b0d -s ours am: 1231038eda -s ours am: af1da94306 -s ours am: ecfa387c5a -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2967636 Change-Id: Ic682181316cf5895eff0603ab4440c59104f15cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [R CTS] am: ↵Almaz Mingaleev
0a6122ecc0 -s ours am: b4049fa722 -s ours am: 34192561cd -s ours am: 736cd54e36 -s ours am: 57dfd44017 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2966701 Change-Id: Ia82aad265f7ff017c0bc1dfdf3bee02498f178f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [Q CTS] am: ↵Almaz Mingaleev
c4f7385936 -s ours am: 0883de6a83 -s ours am: 4e4b803b0d -s ours am: 1231038eda -s ours am: af1da94306 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2967636 Change-Id: I53527fa65c308f02c19d4039c4837052d802d30d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [R CTS] am: ↵Almaz Mingaleev
0a6122ecc0 -s ours am: b4049fa722 -s ours am: 34192561cd -s ours am: 736cd54e36 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2966701 Change-Id: I5585c75a880b45dcc3d0e38e8ec04621f1b4ac8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [Q CTS] am: ↵Almaz Mingaleev
c4f7385936 -s ours am: 0883de6a83 -s ours am: 4e4b803b0d -s ours am: 1231038eda -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2967636 Change-Id: Ib7da6a6733bc99332dba8ec7cdb713f8f56462b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [R CTS] am: ↵Almaz Mingaleev
0a6122ecc0 -s ours am: b4049fa722 -s ours am: 34192561cd -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2966701 Change-Id: I4a26199c92a118bd3520f194b9a6f79e7c871f41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [Q CTS] am: ↵Almaz Mingaleev
c4f7385936 -s ours am: 0883de6a83 -s ours am: 4e4b803b0d -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2967636 Change-Id: I4759f268106278e06de0b7247687d5ae1023d9dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [S CTS] am: ↵Almaz Mingaleev
f7cd412b8e -s ours am: 99f2c60d17 -s ours am: 91b462f5c8 -s ours am: 8330b7fa1f -s ours am: 914b3a44ef -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2966690 Change-Id: I7084490e488455f8830a6e3fa5f79e4afbe77b36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [R CTS] am: ↵Almaz Mingaleev
0a6122ecc0 -s ours am: b4049fa722 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2966701 Change-Id: I6dd271741c64eceb45185a0423cf38a518844427 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [Q CTS] am: ↵Almaz Mingaleev
c4f7385936 -s ours am: 0883de6a83 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2967636 Change-Id: I06a14e7fa39a7ae8ef6dce5e0744b9a3d7191ed2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [Q CTS] am: ↵android11-tests-devAlmaz Mingaleev
c4f7385936 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2967636 Change-Id: I07881ec7d3ccbb0f89c690a71c2e6f0668e9d8a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [R CTS] am: ↵Almaz Mingaleev
0a6122ecc0 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2966701 Change-Id: I04feff6a19e6faa3a6dbd17977ae16141327ed91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [S CTS] am: ↵Almaz Mingaleev
f7cd412b8e -s ours am: 99f2c60d17 -s ours am: 91b462f5c8 -s ours am: 8330b7fa1f -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2966690 Change-Id: Id4cb55abee04c51f72b9bd05e3d09fb0e32692a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [S CTS] am: ↵Almaz Mingaleev
f7cd412b8e -s ours am: 99f2c60d17 -s ours am: 91b462f5c8 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2966690 Change-Id: I4e72f349135141cc5fb97edeb74a8b7fb3402148 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21[automerger skipped] DO NOT MERGE Track tzdb 2023d update. [S CTS] am: ↵Almaz Mingaleev
f7cd412b8e -s ours am: 99f2c60d17 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2966690 Change-Id: I987b5f0280076b8f4ac735974e29ff05334c0adc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 10:13:26 +0000