Update ICU source from 64.2 to 65.1
Copy the files with the following commands:
1. Obtain ICU sources:
$ cd /tmp
$ git clone --branch release-65-1 --depth 1 https://github.com/unicode-org/icu.git
$ cd icu
$ git lfs pull
$ git lfs ls-files # ensure that all lfs-stored files are checked out
2. Update ICU:
$ find icu4j/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|adjust_icudt_path.mk\|liblayout-jarjar-rules.txt\)" -delete
$ find icu4c/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\)" -delete
$ cp -r /tmp/icu/icu4j/* ./icu4j/
$ cp -r /tmp/icu/icu4c/* ./icu4c/
$ git checkout HEAD -- icu4c/.gitignore icu4j/.gitignore
$ git add -A
$ git commit
Bug: 138853239
Test: n/a
Change-Id: I4c3bba15e34c35318b60b8e75c442620fde28f88
diff --git a/icu4j/build.xml b/icu4j/build.xml
index d7c2cb2..411ae76 100644
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -368,6 +368,7 @@
<pathelement location="${icu4j.regiondata.jar}"/>
<pathelement location="${icu4j.translit.jar}"/>
<pathelement location="${icu4j.test-framework.jar}"/>
+ <pathelement location="${icu4j.tools.jar}"/>
<pathelement location="${icu4j.core-tests.jar}"/>
<pathelement location="${icu4j.collate-tests.jar}"/>
<pathelement location="${icu4j.charset-tests.jar}"/>
@@ -570,7 +571,7 @@
</icu-junit>
</target>
- <target name="packagingCheck" depends="info, core, packaging-tests" description="Run packaging tests">
+ <target name="packagingCheck" depends="info, core, langdata, regiondata, packaging-tests" description="Run packaging tests">
<antcall target="_packagingCheckNoLangData"/>
<antcall target="_packagingCheckNoRegionData"/>
<antcall target="_packagingCheckNoLangNorRegionData"/>
@@ -719,7 +720,7 @@
</jar>
</target>
- <target name="icu4jtestsJar" depends="info, tests" description="Build ICU4J all-in-one test jar">
+ <target name="icu4jtestsJar" depends="info, tests, tools" description="Build ICU4J all-in-one test jar">
<jar jarfile="${icu4jtests.jar.file}"
compress="true">
<fileset dir="${icu4j.test-framework.dir}/${bin.dir}" includes="**/*"/>
@@ -727,6 +728,7 @@
<fileset dir="${icu4j.collate-tests.dir}/${bin.dir}" includes="**/*"/>
<fileset dir="${icu4j.translit-tests.dir}/${bin.dir}" includes="**/*"/>
<fileset dir="${icu4j.charset-tests.dir}/${bin.dir}" includes="**/*"/>
+ <fileset dir="${icu4j.tools.dir}/${bin.dir}" includes="com/ibm/icu/dev/tool/locale/**"/>
</jar>
</target>
@@ -1201,7 +1203,7 @@
</ant>
</target>
- <target name="core-tests" depends="core, test-framework" description="Build core tests">
+ <target name="core-tests" depends="core, test-framework, tools" description="Build core tests">
<ant dir="${icu4j.core-tests.dir}" inheritAll="false">
<reference refid="junit.jars"/>
</ant>
@@ -1249,7 +1251,7 @@
<ant dir="${icu4j.build-tools.dir}" inheritAll="false"/>
</target>
- <target name="tools" depends="core, core-tests, collate, translit, translit-tests" description="Build tool classes">
+ <target name="tools" depends="core, collate, translit" description="Build tool classes">
<ant dir="${icu4j.tools.dir}" inheritAll="false"/>
</target>