commit c6a69c2d68b7af63d26c4e0535cb434a8fa52817
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 04 15:48:46 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 04 15:48:46 2019 +0000
tree 37ac02c56a23a659282938be463b30aafb692265
parent 67990e7bdb36f9efc2cce46a6da7d936092ad5ff
parent 07ab84ce33f099f821522a57aa470c5a2ffc8140

Merge "Add ICU.getICUVersion() to intra core api for android_icu4j_tests"

JavaLibrary.bp

diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 4d21721..217915e 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -235,7 +235,6 @@
     visibility: [
         "//external/apache-harmony:__subpackages__",
         "//external/apache-xml",
-        "//external/icu/android_icu4j",
         "//external/okhttp",
         "//libcore:__subpackages__",
     ],

luni/src/main/java/libcore/icu/ICU.java

diff --git a/luni/src/main/java/libcore/icu/ICU.java b/luni/src/main/java/libcore/icu/ICU.java
index d8d878d..5c1923a 100644
--- a/luni/src/main/java/libcore/icu/ICU.java
+++ b/luni/src/main/java/libcore/icu/ICU.java
@@ -31,6 +31,7 @@
  * Makes ICU data accessible to Java.
  * @hide
  */
+@libcore.api.IntraCoreApi
 @libcore.api.CorePlatformApi
 public final class ICU {
 
@@ -363,6 +364,7 @@
   /**
    * Returns the icu4c version in use, such as "50.1.1".
    */
+  @libcore.api.IntraCoreApi
   public static native String getIcuVersion();
 
   /**

mmodules/intracoreapi/api/intra/current-api.txt

diff --git a/mmodules/intracoreapi/api/intra/current-api.txt b/mmodules/intracoreapi/api/intra/current-api.txt
index ebd5763..5e914d2 100644
--- a/mmodules/intracoreapi/api/intra/current-api.txt
+++ b/mmodules/intracoreapi/api/intra/current-api.txt
@@ -90,6 +90,14 @@
 
 }
 
+package libcore.icu {
+
+  @libcore.api.IntraCoreApi @libcore.api.CorePlatformApi public final class ICU {
+    method @libcore.api.IntraCoreApi public static String getIcuVersion();
+  }
+
+}
+
 package libcore.net {
 
   @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public abstract class NetworkSecurityPolicy {