Copy ICU release-68-2 into aosp/icu68
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
Extra command to force adding ignored files:
cd tools/cldr/lib && git add -f install-cldr-jars.sh pom.xml
Change-Id: I601eead71f295e3e69de1bf35fee800ebbb9970b
diff --git a/icu4j/ivy.xml b/icu4j/ivy.xml
index 94e875d..e63f362 100644
--- a/icu4j/ivy.xml
+++ b/icu4j/ivy.xml
@@ -1,6 +1,6 @@
<!--
* © 2017 and later: Unicode, Inc. and others.
-* License & terms of use: http://www.unicode.org/copyright.html#License
+* License & terms of use: http://www.unicode.org/copyright.html
-->
<ivy-module version="2.0">
<info organisation="com.ibm.icu" module="icu4j"/>