Snap for 6439596 from 2e0b59453e964e77dc2a6e4e1ea13baf03f690e9 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I8c70987536368f7fec74816f6e19db26557ff987

3 files changed, 8 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 398e957..6535c2c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,25 +14,16 @@
 // limitations under the License.
 //
 
-package {
-    default_visibility: ["//visibility:private"],
-}
-
 // The set of files that contribute to APIs.
 // Generally, apache-xml source files are not marked with @hide so we add them
 // one-by-one after having done so.
 filegroup {
     name: "apache-xml_api_files",
-    visibility: ["//libcore"],
     srcs: [],
 }
 
 java_library {
     name: "apache-xml",
-    visibility: [
-        "//art/build/apex",
-        "//libcore",
-    ],
     srcs: ["src/main/java/**/*.java"],
     java_resource_dirs: ["src/main/java"],
 
@@ -42,7 +33,8 @@ java_library {
         javacflags: ["-Xep:MissingOverride:OFF"],
     },
 
-    sdk_version: "none",
+    no_standard_libs: true,
+    libs: ["core-all"],
     system_modules: "core-all-system-modules",
 }
 
@@ -51,9 +43,6 @@ java_library {
 // not be stripped. See b/24535627.
 java_library {
     name: "apache-xml-testdex",
-    visibility: [
-        "//art:__subpackages__",
-    ],
     static_libs: ["apache-xml"],
 
     installable: true,
@@ -61,5 +50,5 @@ java_library {
         enabled: false,
     },
 
-    sdk_version: "core_platform",
+    no_framework_libs: true,
 }
diff --git a/OWNERS b/OWNERS
index 87a5dbe..e10f871 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,5 @@
-include platform/libcore:/OWNERS
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+nfuller@google.com
+narayan@google.com
+jiyong@google.com
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
deleted file mode 100644
index 321bab6..0000000
--- a/PREUPLOAD.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[Builtin Hooks]
-bpfmt = true