Snap for 8426163 from f207c52043d762d9cfbfd87986b5194c855a318a 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: Ib2f3e3245197b3dc8492f2df7db058b7b9824199

2 files changed, 0 insertions, 36 deletions

diff --git a/Android.bp b/Android.bp
index d4a1660..c51b357 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,41 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["external_antlr_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.
-// See: http://go/android-license-faq
-license {
-    name: "external_antlr_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-Artistic",
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-FSFAP",
-        "SPDX-license-identifier-MIT",
-        "legacy_notice",
-        "legacy_unencumbered",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
 java_library_host {
     name: "antlr-runtime",
     srcs: ["runtime/Java/src/main/java/**/*.java"],
diff --git a/METADATA b/METADATA
index f6d8745..a19780f 100644
--- a/METADATA
+++ b/METADATA
@@ -10,7 +10,6 @@ third_party {
     value: "https://github.com/antlr/antlr3/archive/3.5.2.zip"
   }
   version: "3.5.2"
-  license_type: NOTICE
   last_upgrade_date {
     year: 2018
     month: 8