Snap for 8426163 from d11d14cd1120bd35793d55026121816089c3ba5b to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I94add5b00ae6794d7cbd20120b648b29e667ffd5

6 files changed, 8 insertions, 84 deletions

diff --git a/Android.bp b/Android.bp
index 3edd4b6a92..7034daf458 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,44 +1,3 @@
-package {
-    default_applicable_licenses: ["external_grpc-grpc_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
-    name: "external_grpc-grpc_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-ISC",
-        "SPDX-license-identifier-MIT",
-        "SPDX-license-identifier-MPL-2.0",
-        "SPDX-license-identifier-Zlib",
-        "legacy_unencumbered",
-    ],
-    license_text: [
-        "LICENSE",
-        "NOTICE.txt",
-    ],
-}
-
 cc_defaults {
     name: "grpc_defaults",
     cflags: [
diff --git a/METADATA b/METADATA
deleted file mode 100644
index 240084ecf3..0000000000
--- a/METADATA
+++ /dev/null
@@ -1,6 +0,0 @@
-third_party {
-  # would be NOTICE save for MPL 2.0 in:
-  #   etc/roots.pem
-  #   src/android/test/interop/app/src/main/assets/roots.pem
-  license_type: RECIPROCAL
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000000..9b5629f2ef
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "postsubmit" : [
+    {
+      "name" : "alarm_test",
+      "host" : true
+    }
+  ]
+}
diff --git a/test/core/util/Android.bp b/test/core/util/Android.bp
index fff362d588..ed87486e02 100644
--- a/test/core/util/Android.bp
+++ b/test/core/util/Android.bp
@@ -1,12 +1,3 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_grpc-grpc_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_grpc-grpc_license"],
-}
-
 cc_library_static {
     name: "libgpr_test_util",
     defaults: ["grpc_defaults"],
diff --git a/test/cpp/common/Android.bp b/test/cpp/common/Android.bp
index 2f6eb43178..6e118cad49 100644
--- a/test/cpp/common/Android.bp
+++ b/test/cpp/common/Android.bp
@@ -1,12 +1,3 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_grpc-grpc_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_grpc-grpc_license"],
-}
-
 cc_test {
     name: "alarm_test",
     defaults: ["grpc_defaults"],
diff --git a/third_party/address_sorting/Android.bp b/third_party/address_sorting/Android.bp
index 1756a37dcb..767644e821 100644
--- a/third_party/address_sorting/Android.bp
+++ b/third_party/address_sorting/Android.bp
@@ -1,22 +1,3 @@
-package {
-    default_applicable_licenses: [
-        "external_grpc-grpc_third_party_address_sorting_license",
-    ],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "external_grpc-grpc_third_party_address_sorting_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-BSD",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
 cc_library_static {
     name: "libaddress_sorting",
     defaults: ["grpc_defaults"],