summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android_icu4j/Android.bp10
-rw-r--r--android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java2
-rw-r--r--icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java2
3 files changed, 7 insertions, 7 deletions
diff --git a/android_icu4j/Android.bp b/android_icu4j/Android.bp
index f18108e67..f73147a5c 100644
--- a/android_icu4j/Android.bp
+++ b/android_icu4j/Android.bp
@@ -168,9 +168,9 @@ platform_compat_config {
java_sdk_library {
name: "i18n.module.public.api",
visibility: [
+ "//build/soong/java/core-libraries",
"//frameworks/base",
"//frameworks/base/api",
- "//libcore",
"//packages/modules/RuntimeI18n/apex",
// Visibility for prebuilt i18n-module-sdk from the prebuilt of
// this module.
@@ -328,7 +328,7 @@ java_sdk_library {
":android_icu4j_repackaged_src_files",
],
visibility: [
- "//libcore:__subpackages__",
+ "//build/soong/java/core-libraries",
"//packages/modules/RuntimeI18n/apex",
// Visibility for prebuilt i18n-module-sdk from the prebuilt of
// this module.
@@ -340,7 +340,7 @@ java_sdk_library {
api_dir: "api/legacy_platform",
api_only: true,
sdk_version: "none",
- system_modules: "legacy-art-module-platform-api-stubs-system-modules",
+ system_modules: "art-module-lib-api-stubs-system-modules",
droiddoc_options: [
"--hide-annotation libcore.api.Hide ",
@@ -358,7 +358,7 @@ java_sdk_library {
":android_icu4j_repackaged_src_files",
],
visibility: [
- "//libcore:__subpackages__",
+ "//build/soong/java/core-libraries",
"//packages/modules/RuntimeI18n/apex",
// Visibility for prebuilt i18n-module-sdk from the prebuilt of
// this module.
@@ -370,7 +370,7 @@ java_sdk_library {
api_dir: "api/stable_platform",
api_only: true,
sdk_version: "none",
- system_modules: "stable-art-module-platform-api-stubs-system-modules",
+ system_modules: "art-module-lib-api-stubs-system-modules",
droiddoc_options: [
"--hide-annotation libcore.api.Hide ",
diff --git a/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java b/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java
index bd522bc82..11fc181ff 100644
--- a/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java
+++ b/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java
@@ -48,7 +48,7 @@ import android.icu.util.VersionInfo;
* sets. RuleBasedCollator is designed to be fully compliant to the <a
* href="http://www.unicode.org/unicode/reports/tr10/">Unicode Collation Algorithm (UCA)</a> and conforms to ISO 14651.
*
- * <p>A Collator is thread-safe only when frozen. See {{@link #isFrozen()} and {@link android.icu.util.Freezable}.
+ * <p>A Collator is thread-safe only when frozen. See {@link #isFrozen()} and {@link android.icu.util.Freezable}.
*
* <p>
* Users are strongly encouraged to read the <a href="https://unicode-org.github.io/icu/userguide/collation">User
diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
index a8c0033d2..e525b1bf4 100644
--- a/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
@@ -47,7 +47,7 @@ import com.ibm.icu.util.VersionInfo;
* sets. RuleBasedCollator is designed to be fully compliant to the <a
* href="http://www.unicode.org/unicode/reports/tr10/">Unicode Collation Algorithm (UCA)</a> and conforms to ISO 14651.
*
- * <p>A Collator is thread-safe only when frozen. See {{@link #isFrozen()} and {@link com.ibm.icu.util.Freezable}.
+ * <p>A Collator is thread-safe only when frozen. See {@link #isFrozen()} and {@link com.ibm.icu.util.Freezable}.
*
* <p>
* Users are strongly encouraged to read the <a href="https://unicode-org.github.io/icu/userguide/collation">User