Android patch: Add --omitCollationRules to genrb.

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

Removed "--omitCollationRules" option from Makefile.in and add it in
BUILDRULES.py in a separate CL in ICU 64.2.

Test: n/a
Change-Id: Ic454cc09164487aeadb1dcd421cbefe6efb08225

5 files changed, 31 insertions, 11 deletions

diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationAPITest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationAPITest.java
index 84c3a201e..3b595f9ab 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationAPITest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationAPITest.java
@@ -496,8 +496,10 @@ public class CollationAPITest extends TestFmwk {
         doAssert((col.getDecomposition() == Collator.NO_DECOMPOSITION), "Decomposition mode = Collator.NO_DECOMPOSITION");
 
 
-        RuleBasedCollator rcol = (RuleBasedCollator)Collator.getInstance(new Locale("da", "DK"));
-        doAssert(rcol.getRules().length() != 0, "da_DK rules does not have length 0");
+        // Android patch: Add --omitCollationRules to genrb.
+        // RuleBasedCollator rcol = (RuleBasedCollator)Collator.getInstance(new Locale("da", "DK"));
+        // doAssert(rcol.getRules().length() != 0, "da_DK rules does not have length 0");
+        // Android patch end.
 
         try {
             col = Collator.getInstance(Locale.FRENCH);
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationCreationMethodTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationCreationMethodTest.java
index 2797b1c26..1c248de49 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationCreationMethodTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationCreationMethodTest.java
@@ -120,7 +120,9 @@ public class CollationCreationMethodTest extends TestFmwk
             msg.append(" failed to produce identical keys on both collators\n");
             msg.append("  localeCollator key: ").append(CollationTest.prettify(k1)).append('\n');
             msg.append("  ruleCollator   key: ").append(CollationTest.prettify(k2)).append('\n');
-            errln(msg.toString());
+            // Android patch: Add --omitCollationRules to genrb.
+            logln(msg.toString());
+            // Android patch end.
         }
     }
 }
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java
index f008297fd..ac78e4912 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java
@@ -1986,7 +1986,9 @@ public class CollationMiscTest extends TestFmwk {
             }
             coll = new RuleBasedCollator(rule);
         } catch (Exception e) {
-            warnln(e.getMessage());
+            // Android patch: Add --omitCollationRules to genrb.
+            logln(e.getMessage());
+            // Android patch end.
         }
     }
 
@@ -3081,7 +3083,9 @@ public class CollationMiscTest extends TestFmwk {
             }
 
         }catch(Exception e){
-            warnln("ERROR: in creation of rule based collator");
+            // Android patch: Add --omitCollationRules to genrb.
+            logln("ERROR: in creation of rule based collator");
+            // Android patch end.
         }
     }
 
@@ -3110,7 +3114,9 @@ public class CollationMiscTest extends TestFmwk {
             }
 
         }catch(Exception e){
-            warnln("ERROR: in creation of rule based collator");
+            // Android patch: Add --omitCollationRules to genrb.
+            logln("ERROR: in creation of rule based collator");
+            // Android patch end.
         }
     }
 
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationTest.java
index 5b2212a6d..1a4b2fa9b 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationTest.java
@@ -1324,7 +1324,9 @@ public class CollationTest extends TestFmwk {
             coll = new RuleBasedCollator(rules.toString());
         } catch (Exception e) {
             logln(rules.toString());
-            errln("RuleBasedCollator(rules) failed - " + e.getMessage());
+            // Android patch: Add --omitCollationRules to genrb.
+            logln("RuleBasedCollator(rules) failed - " + e.getMessage());
+            // Android patch end.
             coll = null;
         }
     }
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/G7CollationTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/G7CollationTest.java
index 29770da58..cd45c2d54 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/G7CollationTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/G7CollationTest.java
@@ -243,7 +243,9 @@ public class G7CollationTest extends TestFmwk{
             if (ok1) {
                 logln(msg1 + source + msg2 + target + msg3 + sResult);
             } else {
-                errln(msg1 + source + msg2 + target + msg3 + sResult + msg4 + sExpect);
+                // Android patch: Add --omitCollationRules to genrb.
+                logln(msg1 + source + msg2 + target + msg3 + sResult + msg4 + sExpect);
+                // Android patch end.
             }
 
             msg1 = ok2 ? "Ok: key(\"" : "FAIL: key(\"";
@@ -253,10 +255,14 @@ public class G7CollationTest extends TestFmwk{
             if (ok2) {
                 logln(msg1 + source + msg2 + target + msg3 + sResult);
             } else {
-                errln(msg1 + source + msg2 + target + msg3 + sResult + msg4 + sExpect);
+                // Android patch: Add --omitCollationRules to genrb.
+                logln(msg1 + source + msg2 + target + msg3 + sResult + msg4 + sExpect);
+                // Android patch end.
                 msg1 = "  ";
                 msg2 = " vs. ";
-                errln(msg1 + CollationTest.prettify(sourceKey) + msg2 + CollationTest.prettify(targetKey));
+                // Android patch: Add --omitCollationRules to genrb.
+                logln(msg1 + CollationTest.prettify(sourceKey) + msg2 + CollationTest.prettify(targetKey));
+                // Android patch end.
             }
 
             msg1 = ok3 ? "Ok: incCompare(\"" : "FAIL: incCompare(\"";
@@ -268,7 +274,9 @@ public class G7CollationTest extends TestFmwk{
             if (ok3) {
                 logln(msg1 + source + msg2 + target + msg3 + sResult);
             } else {
-                errln(msg1 + source + msg2 + target + msg3 + sResult + msg4 + sExpect);
+                // Android patch: Add --omitCollationRules to genrb.
+                logln(msg1 + source + msg2 + target + msg3 + sResult + msg4 + sExpect);
+                // Android patch end.
             }
         }
     }