Snap for 8426163 from 127c3cd569dcb5fe47d3b420086d30853d0361da 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: Ia89bdbcf8a37920288a9e6c37a02db3df30ab7db

25 files changed, 3 insertions, 227 deletions

diff --git a/Android.bp b/Android.bp
index 407cdf7..8861355 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,23 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    default_applicable_licenses: ["external_libese_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "external_libese_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
 subdirs = [
     "apps",
     "esed",
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}
diff --git a/apps/Android.bp b/apps/Android.bp
index 8652b7a..4407cf1 100644
--- a/apps/Android.bp
+++ b/apps/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_library_headers {
     name: "libese-app-headers",
     host_supported: true,
diff --git a/apps/boot/Android.bp b/apps/boot/Android.bp
index af5c494..17a65df 100644
--- a/apps/boot/Android.bp
+++ b/apps/boot/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_library {
     name: "libese-app-boot",
     defaults: ["libese-app-defaults"],
diff --git a/apps/boot/tests/Android.bp b/apps/boot/tests/Android.bp
index 8ce69d6..48a1f2b 100644
--- a/apps/boot/tests/Android.bp
+++ b/apps/boot/tests/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_test {
     name: "ese_app_boot_tests",
     proprietary: true,
diff --git a/apps/weaver/Android.bp b/apps/weaver/Android.bp
index dd3577a..b3eb42e 100644
--- a/apps/weaver/Android.bp
+++ b/apps/weaver/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_library {
     name: "libese-app-weaver",
     defaults: ["libese-app-defaults"],
diff --git a/esed/Android.bp b/esed/Android.bp
index e2048ac..07b1021 100644
--- a/esed/Android.bp
+++ b/esed/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_defaults {
     name: "esed_defaults",
     proprietary: true,
diff --git a/examples/Android.bp b/examples/Android.bp
index 6abfbfe..7c36ad1 100644
--- a/examples/Android.bp
+++ b/examples/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_binary {
     name: "ese_nxp_sample",
     proprietary: true,
diff --git a/libapdu/Android.bp b/libapdu/Android.bp
index 4577693..037f46d 100644
--- a/libapdu/Android.bp
+++ b/libapdu/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 subdirs = ["tests"]
 
 cc_defaults {
diff --git a/libapdu/tests/Android.bp b/libapdu/tests/Android.bp
index a871429..769b4fb 100644
--- a/libapdu/tests/Android.bp
+++ b/libapdu/tests/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_test {
     name: "libapdu_test",
     srcs: [
diff --git a/libese-cpp/Android.bp b/libese-cpp/Android.bp
index 18a980d..7339e10 100644
--- a/libese-cpp/Android.bp
+++ b/libese-cpp/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_defaults {
     name: "libese_cpp_defaults",
     proprietary: true,
diff --git a/libese-hw/Android.bp b/libese-hw/Android.bp
index 85bed08..7e0d555 100644
--- a/libese-hw/Android.bp
+++ b/libese-hw/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_library {
     name: "libese-hw-fake",
     proprietary: true,
diff --git a/libese-hw/nxp/Android.bp b/libese-hw/nxp/Android.bp
index 6ff143e..5dab88f 100644
--- a/libese-hw/nxp/Android.bp
+++ b/libese-hw/nxp/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_library {
     name: "libese-hw-nxp-pn80t-common",
     proprietary: true,
diff --git a/libese-hw/tests/Android.bp b/libese-hw/tests/Android.bp
index 98b3854..ef1f783 100644
--- a/libese-hw/tests/Android.bp
+++ b/libese-hw/tests/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_test {
     name: "ese_hw_tests",
     proprietary: true,
diff --git a/libese-sysdeps/Android.bp b/libese-sysdeps/Android.bp
index f60e8eb..2e2fa1d 100644
--- a/libese-sysdeps/Android.bp
+++ b/libese-sysdeps/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_library {
     name: "libese-sysdeps",
     proprietary: true,
diff --git a/libese-teq1/Android.bp b/libese-teq1/Android.bp
index 1bb2e6b..2e13a71 100644
--- a/libese-teq1/Android.bp
+++ b/libese-teq1/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_library {
     name: "libese-teq1",
     defaults: ["libese-api-defaults"],
diff --git a/libese-teq1/tests/Android.bp b/libese-teq1/tests/Android.bp
index 7ca30ae..ada25ce 100644
--- a/libese-teq1/tests/Android.bp
+++ b/libese-teq1/tests/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_test {
     name: "ese_teq1_unittests",
     proprietary: true,
diff --git a/libese/Android.bp b/libese/Android.bp
index b729f1a..8e2296c 100644
--- a/libese/Android.bp
+++ b/libese/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_defaults {
     name: "libese-defaults",
 
diff --git a/libese/tests/Android.bp b/libese/tests/Android.bp
index e3b4f3b..9e10f03 100644
--- a/libese/tests/Android.bp
+++ b/libese/tests/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_test {
     name: "ese_unittests",
     proprietary: true,
diff --git a/third_party/Android.bp b/third_party/Android.bp
index edda3fd..d9a9164 100644
--- a/third_party/Android.bp
+++ b/third_party/Android.bp
@@ -1,12 +1,4 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 subdirs = [
     "NXPNFC_P61_JCOP_Kit"
 ]
+
diff --git a/third_party/NXPNFC_P61_JCOP_Kit/Android.bp b/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
index 708e3f8..310cc5b 100644
--- a/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
+++ b/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
@@ -1,15 +1,6 @@
 //#####################################
 // Build shared library vendor/lib/libp61-jcop-kit.so
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_library_shared {
     name: "libp61-jcop-kit",
     proprietary: true,
@@ -43,3 +34,4 @@ cc_library_shared {
     ],
 
 }
+
diff --git a/tools/Android.bp b/tools/Android.bp
index bc0661a..d83baae 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 subdirs = [
     "ese_ls_provision",
     "ese_relay",
diff --git a/tools/ese_ls_provision/Android.bp b/tools/ese_ls_provision/Android.bp
index 0bcac19..c5dd636 100644
--- a/tools/ese_ls_provision/Android.bp
+++ b/tools/ese_ls_provision/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_binary {
     name: "ese-ls-provision",
     proprietary: true,
@@ -41,3 +32,4 @@ cc_binary {
         "libbase", "libese", "libese-hw-nxp-pn80t-nq-nci", "libese-teq1", "libp61-jcop-kit"],
     srcs: ["ese_ls_provision.cpp"],
 }
+
diff --git a/tools/ese_relay/Android.bp b/tools/ese_relay/Android.bp
index 63e59cb..6a64c56 100644
--- a/tools/ese_relay/Android.bp
+++ b/tools/ese_relay/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_defaults {
     name: "ese-relay-defaults",
     host_supported: false,
diff --git a/tools/ese_replay/Android.bp b/tools/ese_replay/Android.bp
index 250fdbe..2721b3e 100644
--- a/tools/ese_replay/Android.bp
+++ b/tools/ese_replay/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libese_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_libese_license"],
-}
-
 cc_binary {
     name: "ese-replay",
     proprietary: true,