diff options
| author | Victor Chang <vichang@google.com> | 2021-01-18 17:56:33 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2021-01-19 16:12:46 +0000 |
| commit | 978167a4775e0a41aa6e7bc14de93d977dbbb5b9 (patch) | |
| tree | 5d0cdd05d8e8c50b6d4647c454f4b2577a4c9ec0 /icu4j/samples/src | |
| parent | 8ad64df576fd6880ff73969b9a53f786c2a83a67 (diff) | |
| download | icu-978167a4775e0a41aa6e7bc14de93d977dbbb5b9.tar.gz | |
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
Diffstat (limited to 'icu4j/samples/src')
16 files changed, 19 insertions, 19 deletions
diff --git a/icu4j/samples/src/com/ibm/icu/samples/iuc/PopulationData.java b/icu4j/samples/src/com/ibm/icu/samples/iuc/PopulationData.java index f08da413f..07109667f 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/iuc/PopulationData.java +++ b/icu4j/samples/src/com/ibm/icu/samples/iuc/PopulationData.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2013-2014, International Business Machines Corporation and * diff --git a/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample13_Hello.java b/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample13_Hello.java index df9b6f37c..dfb7509c5 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample13_Hello.java +++ b/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample13_Hello.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2013-2014, International Business Machines Corporation and * diff --git a/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample30_ResHello.java b/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample30_ResHello.java index 85a71cc4a..8d91a94eb 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample30_ResHello.java +++ b/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample30_ResHello.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2013-2014, International Business Machines Corporation and * diff --git a/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample40_PopMsg.java b/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample40_PopMsg.java index 53cb02c65..2de898920 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample40_PopMsg.java +++ b/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample40_PopMsg.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2013-2014, International Business Machines Corporation and * diff --git a/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample50_PopSort.java b/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample50_PopSort.java index 1450f15b0..97a14a138 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample50_PopSort.java +++ b/icu4j/samples/src/com/ibm/icu/samples/iuc/Sample50_PopSort.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2013-2014, International Business Machines Corporation and * diff --git a/icu4j/samples/src/com/ibm/icu/samples/iuc/SupplementalUtilities.java b/icu4j/samples/src/com/ibm/icu/samples/iuc/SupplementalUtilities.java index 9f52f2726..f6674b853 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/iuc/SupplementalUtilities.java +++ b/icu4j/samples/src/com/ibm/icu/samples/iuc/SupplementalUtilities.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2013-2016, International Business Machines Corporation and diff --git a/icu4j/samples/src/com/ibm/icu/samples/iuc/package-info.java b/icu4j/samples/src/com/ibm/icu/samples/iuc/package-info.java index 407e4b3f0..6fc3b446b 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/iuc/package-info.java +++ b/icu4j/samples/src/com/ibm/icu/samples/iuc/package-info.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2013, International Business Machines Corporation and * @@ -12,4 +12,4 @@ * This package contains samples for the IUC ICU workshops. * */ -package com.ibm.icu.samples.iuc;
\ No newline at end of file +package com.ibm.icu.samples.iuc; diff --git a/icu4j/samples/src/com/ibm/icu/samples/shaping/ArabicShapingSample.java b/icu4j/samples/src/com/ibm/icu/samples/shaping/ArabicShapingSample.java index 78f5c691e..4dff694a4 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/shaping/ArabicShapingSample.java +++ b/icu4j/samples/src/com/ibm/icu/samples/shaping/ArabicShapingSample.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2001-2009, International Business Machines diff --git a/icu4j/samples/src/com/ibm/icu/samples/text/dateintervalformat/DateIntervalFormatSample.java b/icu4j/samples/src/com/ibm/icu/samples/text/dateintervalformat/DateIntervalFormatSample.java index fd47af53e..0778d7e6d 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/text/dateintervalformat/DateIntervalFormatSample.java +++ b/icu4j/samples/src/com/ibm/icu/samples/text/dateintervalformat/DateIntervalFormatSample.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2013, International Business Machines Corporation and * diff --git a/icu4j/samples/src/com/ibm/icu/samples/text/datetimepatterngenerator/DateTimePatternGeneratorSample.java b/icu4j/samples/src/com/ibm/icu/samples/text/datetimepatterngenerator/DateTimePatternGeneratorSample.java index 49b83b1cf..4066263da 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/text/datetimepatterngenerator/DateTimePatternGeneratorSample.java +++ b/icu4j/samples/src/com/ibm/icu/samples/text/datetimepatterngenerator/DateTimePatternGeneratorSample.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2013, International Business Machines Corporation and * @@ -182,4 +182,4 @@ public class DateTimePatternGeneratorSample { **************************************************************************************************/ // ---replaceFieldTypesExample } -}
\ No newline at end of file +} diff --git a/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MessagePatternDemo.java b/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MessagePatternDemo.java index 6123c42c0..16adb4564 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MessagePatternDemo.java +++ b/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MessagePatternDemo.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2010-2011, International Business Machines diff --git a/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MessagePatternUtilDemo.java b/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MessagePatternUtilDemo.java index 33161e966..da525ef1a 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MessagePatternUtilDemo.java +++ b/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MessagePatternUtilDemo.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2011, International Business Machines diff --git a/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MiniMessageFormatter.java b/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MiniMessageFormatter.java index b4b283948..aedcac118 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MiniMessageFormatter.java +++ b/icu4j/samples/src/com/ibm/icu/samples/text/messagepattern/MiniMessageFormatter.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2010-2011, International Business Machines diff --git a/icu4j/samples/src/com/ibm/icu/samples/text/pluralformat/PluralFormatSample.java b/icu4j/samples/src/com/ibm/icu/samples/text/pluralformat/PluralFormatSample.java index 3e047135d..c40b35cb5 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/text/pluralformat/PluralFormatSample.java +++ b/icu4j/samples/src/com/ibm/icu/samples/text/pluralformat/PluralFormatSample.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2013-2014, International Business Machines Corporation and * @@ -94,4 +94,4 @@ public class PluralFormatSample { *******************************************************************/ // ---PluralFormatExample } -}
\ No newline at end of file +} diff --git a/icu4j/samples/src/com/ibm/icu/samples/util/timescale/PivotDemo.java b/icu4j/samples/src/com/ibm/icu/samples/util/timescale/PivotDemo.java index cf220ab20..976b51b5e 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/util/timescale/PivotDemo.java +++ b/icu4j/samples/src/com/ibm/icu/samples/util/timescale/PivotDemo.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 1996-2011, International Business Machines Corporation and * diff --git a/icu4j/samples/src/com/ibm/icu/samples/util/timezone/BasicTimeZoneExample.java b/icu4j/samples/src/com/ibm/icu/samples/util/timezone/BasicTimeZoneExample.java index 822bc0862..600846309 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/util/timezone/BasicTimeZoneExample.java +++ b/icu4j/samples/src/com/ibm/icu/samples/util/timezone/BasicTimeZoneExample.java @@ -1,5 +1,5 @@ // © 2016 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 /* ******************************************************************************* * Copyright (C) 2011, International Business Machines Corporation and * |