Revert "Calling @IntraCoreApi from core-icu4j should not cause "..."
Revert "Move v8 and libpac into i18n APEX"
Revert "Move core-icu4j into I18n APEX"
Revert "Move ICU from ART APEX into i18n APEX"
Revert "Move core-icu4j into i18n APEX"
Revert "Move libpac into i18n APEX"
Revert "Add shared library into i18n APEX and add the required s..."
Revert "Make com_android_i18n namespace visible"
Revert submission 1299494-i18nApex
Reason for revert: Breaking aosp_x86-eng on aosp-master
Reverted Changes:
I30fc3735b:Move ICU from ART APEX to i18n APEX
Icb7e98b5c:Calling @IntraCoreApi from core-icu4j should not c...
Ic7de63fe3:Move core-icu4j into I18n APEX
I65b97bdba:Make com_android_i18n namespace visible
Ia4c83bc15:Move v8 and libpac into i18n APEX
I10e6d4948:Move core-icu4j into i18n APEX
I8d989cad7:Move ICU from ART APEX into i18n APEX
I72216ca12:Move ICU into i18n APEX
Ief9dace85:Add shared library into i18n APEX and add the requ...
I7d97a10ba:Move libpac into i18n APEX
I90fff9c55:Move ICU from ART APEX into i18n APEX
Change-Id: Ica8f978af397a5ef84847246c89f724b3f8e7d6e
diff --git a/libartbase/base/file_utils.cc b/libartbase/base/file_utils.cc
index e827964..98b69f3 100644
--- a/libartbase/base/file_utils.cc
+++ b/libartbase/base/file_utils.cc
@@ -72,7 +72,6 @@
static constexpr const char* kAndroidDataDefaultPath = "/data";
static constexpr const char* kAndroidArtRootEnvVar = "ANDROID_ART_ROOT";
static constexpr const char* kAndroidConscryptRootEnvVar = "ANDROID_CONSCRYPT_ROOT";
-static constexpr const char* kAndroidI18nRootEnvVar = "ANDROID_I18N_ROOT";
// Get the "root" directory containing the "lib" directory where this instance
// of the libartbase library (which contains `GetRootContainingLibartbase`) is
@@ -454,11 +453,6 @@
full_path, kAndroidConscryptRootEnvVar, kAndroidConscryptApexDefaultPath);
}
-bool LocationIsOnI18nModule(const char* full_path) {
- return IsLocationOnModule(
- full_path, kAndroidI18nRootEnvVar, kAndroidI18nApexDefaultPath);
-}
-
bool LocationIsOnApex(const char* full_path) {
return android::base::StartsWith(full_path, kApexDefaultPath);
}
diff --git a/libartbase/base/file_utils.h b/libartbase/base/file_utils.h
index de60483..a521c97 100644
--- a/libartbase/base/file_utils.h
+++ b/libartbase/base/file_utils.h
@@ -104,9 +104,6 @@
// Return whether the location is on /apex/com.android.conscrypt
bool LocationIsOnConscryptModule(const char* location);
-// Return whether the location is on /apex/com.android.i18n
-bool LocationIsOnI18nModule(const char* location);
-
// Return whether the location is on system (i.e. android root).
bool LocationIsOnSystem(const char* location);
diff --git a/runtime/hidden_api.cc b/runtime/hidden_api.cc
index d13d716..6ac57b6 100644
--- a/runtime/hidden_api.cc
+++ b/runtime/hidden_api.cc
@@ -94,8 +94,7 @@
// is set to "/system".
if (ArtModuleRootDistinctFromAndroidRoot()) {
if (LocationIsOnArtModule(dex_location.c_str()) ||
- LocationIsOnConscryptModule(dex_location.c_str()) ||
- LocationIsOnI18nModule(dex_location.c_str())) {
+ LocationIsOnConscryptModule(dex_location.c_str())) {
return Domain::kCorePlatform;
}
diff --git a/test/674-hiddenapi/src-ex/ChildClass.java b/test/674-hiddenapi/src-ex/ChildClass.java
index 855134b..9295655 100644
--- a/test/674-hiddenapi/src-ex/ChildClass.java
+++ b/test/674-hiddenapi/src-ex/ChildClass.java
@@ -103,6 +103,7 @@
ChildClass.everythingWhitelisted = everythingWhitelisted;
boolean isSameBoot = (isParentInBoot == isChildInBoot);
+ boolean isDebuggable = VMRuntime.getRuntime().isJavaDebuggable();
// For compat reasons, meta-reflection should still be usable by apps if hidden api check
// hardening is disabled (i.e. target SDK is Q or earlier). The only configuration where this