diff options
author | Jiyong Park <jiyong@google.com> | 2020-05-17 15:24:07 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-17 15:24:07 +0000 |
commit | 01da4e7850ff499c6af47694ff525102cc46e10e (patch) | |
tree | 854a747dbabae94290fe5ff72b171683f45ccb99 | |
parent | e1718db3fbd90f9768ca67a68a842123c7545794 (diff) | |
parent | 3eb738b0655b17cfff116f1d18990116fea4407d (diff) | |
download | icu-01da4e7850ff499c6af47694ff525102cc46e10e.tar.gz |
Merge "Revert "Set apex_available property"" into rvc-dev
-rw-r--r-- | android_icu4c/Android.bp | 6 | ||||
-rw-r--r-- | android_icu4j/Android.bp | 5 | ||||
-rw-r--r-- | icu4c/source/Android.bp | 5 | ||||
-rw-r--r-- | icu4c/source/common/Android.bp | 11 | ||||
-rw-r--r-- | icu4c/source/i18n/Android.bp | 5 | ||||
-rw-r--r-- | libandroidicuinit/Android.bp | 5 |
6 files changed, 0 insertions, 37 deletions
diff --git a/android_icu4c/Android.bp b/android_icu4c/Android.bp index 0e3c3da1e..dcae82cb9 100644 --- a/android_icu4c/Android.bp +++ b/android_icu4c/Android.bp @@ -25,10 +25,4 @@ cc_library_headers { enabled: true, }, }, - - apex_available: [ - "//apex_available:platform", - "com.android.art.debug", - "com.android.art.release", - ], } diff --git a/android_icu4j/Android.bp b/android_icu4j/Android.bp index 329801643..ce86961b0 100644 --- a/android_icu4j/Android.bp +++ b/android_icu4j/Android.bp @@ -98,11 +98,6 @@ java_library_static { "-Xep:ConstantOverflow:WARN", // Known constant overflow in SplittableRandom ], }, - - apex_available: [ - "com.android.art.release", - "com.android.art.debug", - ], } // A separated core library that contains ICU4J because ICU4J will be in a different APEX module, diff --git a/icu4c/source/Android.bp b/icu4c/source/Android.bp index 93c27639c..d04f7d371 100644 --- a/icu4c/source/Android.bp +++ b/icu4c/source/Android.bp @@ -43,9 +43,4 @@ cc_library { ], }, }, - - apex_available: [ - "com.android.art.release", - "com.android.art.debug", - ], } diff --git a/icu4c/source/common/Android.bp b/icu4c/source/common/Android.bp index 502d1dd4e..c6f1dece5 100644 --- a/icu4c/source/common/Android.bp +++ b/icu4c/source/common/Android.bp @@ -71,12 +71,6 @@ cc_library_headers { enabled: true, }, }, - - apex_available: [ - "//apex_available:platform", - "com.android.art.debug", - "com.android.art.release", - ], } // @@ -109,9 +103,4 @@ cc_library { }, header_libs: ["libicuuc_headers"], export_header_lib_headers: ["libicuuc_headers"], - - apex_available: [ - "com.android.art.debug", - "com.android.art.release", - ], } diff --git a/icu4c/source/i18n/Android.bp b/icu4c/source/i18n/Android.bp index bae2b9fe1..48ac41b89 100644 --- a/icu4c/source/i18n/Android.bp +++ b/icu4c/source/i18n/Android.bp @@ -61,11 +61,6 @@ cc_library_headers { enabled: true, }, }, - - apex_available: [ - "com.android.art.debug", - "com.android.art.release", - ], } // diff --git a/libandroidicuinit/Android.bp b/libandroidicuinit/Android.bp index 32bb72d25..8345a64e9 100644 --- a/libandroidicuinit/Android.bp +++ b/libandroidicuinit/Android.bp @@ -47,9 +47,4 @@ cc_library_static { "//external/icu/icu4c/source/test:__subpackages__", "//libcore", ], - - apex_available: [ - "com.android.art.release", - "com.android.art.debug", - ], } |