Snap for 8426163 from 1151cfe383321b5d71dd3d32e595ffaa28bca7db 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: Iacb9bb1b6fa4e1c4878ddecbd3549d9474a1c74f

2 files changed, 0 insertions, 59 deletions

diff --git a/Android.bp b/Android.bp
index 13f7a8430..68567d967 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,48 +15,6 @@
 // build javaparser jar
 // ============================================================
 
-package {
-    default_applicable_licenses: ["external_javaparser_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_javaparser_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-GPL",
-        "SPDX-license-identifier-GPL-3.0",
-        "SPDX-license-identifier-LGPL",
-        "SPDX-license-identifier-LGPL-2.1",
-        "SPDX-license-identifier-LGPL-3.0",
-    ],
-    license_text: [
-        "LICENSE",
-        "LICENSE.APACHE",
-        "LICENSE.GPL",
-        "LICENSE.LGPL",
-    ],
-}
-
 java_library_host {
     name: "javaparser",
 
@@ -66,19 +24,3 @@ java_library_host {
         "javaparser-core/generated-sources/**/*.java",
     ],
 }
-
-java_library_host {
-    name: "javaparser-symbol-solver",
-
-    srcs: [
-        "javaparser-symbol-solver-core/src/main/java/**/*.java",
-        "javaparser-symbol-solver-logic/src/main/java/**/*.java",
-        "javaparser-symbol-solver-model/src/main/java/**/*.java",
-    ],
-
-    static_libs: [
-        "guava",
-        "javaparser",
-        "javassist",
-    ],
-}
diff --git a/METADATA b/METADATA
index d50860bc7..3462ab14f 100644
--- a/METADATA
+++ b/METADATA
@@ -10,7 +10,6 @@ third_party {
     value: "https://github.com/javaparser/javaparser.git"
   }
   version: "cf661694c8bf0dab9b2362f4d7a52e636dd1cbf2"
-  license_type: RESTRICTED
   last_upgrade_date {
     year: 2018
     month: 3