Snap for 8426163 from 7a527b438b50a517645be2b876259121118bda39 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: I912f69eb871d419b7ae877ab66d4c46bb4c62fd2

3 files changed, 0 insertions, 51 deletions

diff --git a/Android.bp b/Android.bp
index bd07587..100fdf8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,44 +14,6 @@
 //
 //
 
-package {
-    default_applicable_licenses: ["external_nanopb-c_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_nanopb-c_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-MIT",
-        "SPDX-license-identifier-Zlib",
-        "legacy_unencumbered",
-    ],
-    license_text: [
-        "LICENSE.txt",
-        "NOTICE",
-    ],
-}
-
 cc_defaults {
     name: "libprotobuf-c-nano-defaults",
     cflags: [
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/generator/Android.bp b/generator/Android.bp
index cd7516c..aa94f65 100644
--- a/generator/Android.bp
+++ b/generator/Android.bp
@@ -1,13 +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_nanopb-c_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-BSD
-    //   SPDX-license-identifier-MIT
-    default_applicable_licenses: ["external_nanopb-c_license"],
-}
-
 python_binary_host {
    name: "protoc-gen-nanopb",
    main: "nanopb_generator.py",