Snap for 6439596 from 9fe3e8708733ac26153048a03b1b0f83a206ea51 to qt-aml-tzdata-releaseq_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: Ic4e703bfdb16a7c74b9b500e6174d8963aeb598a

3 files changed, 6 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index b86fc07..2f4d1df 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,25 +14,20 @@
 // limitations under the License.
 //
 
-package {
-    default_visibility: ["//visibility:private"],
-}
-
 java_library_static {
     name: "wycheproof",
-    visibility: [
-        "//cts/tests/libcore/wycheproof",
-        "//cts/tests/libcore/wycheproof-bc",
-    ],
     srcs: ["java/**/*.java"],
     exclude_srcs: [
         "java/com/google/security/wycheproof/SpongyCastleTest.java",
         "java/com/google/security/wycheproof/SpongyCastleAllTests.java",
     ],
-    sdk_version: "none",
-    system_modules: "art-module-platform-api-stubs-system-modules",
+    no_standard_libs: true,
     libs: [
-        "conscrypt.module.platform.api.stubs",
+        "core-oj",
+        "core-libart",
+        "bouncycastle",
+        "conscrypt",
         "junit",
     ],
+    system_modules: "core-system-modules",
 }
diff --git a/OWNERS b/OWNERS
index 5b74502..f2757b0 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,3 @@
 # Default code reviewers picked from top 3 or more developers.
 # Please update this list if you find better candidates.
 flooey@google.com
-prb@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