Snap for 8426163 from 9b3c02f8d1cf0e0fde6faaaf63bb0179af383100 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: Id4576540531d0722702b2b93905a16d1e3add3b8

7 files changed, 1 insertions, 80 deletions

diff --git a/Android.bp b/Android.bp
index d90b1498..40faeef2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,36 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["external_smali_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_smali_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
 filegroup {
     name: "smali_script",
     srcs: ["scripts/smali"],
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975ca..00000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}
diff --git a/baksmali/Android.bp b/baksmali/Android.bp
index 6d6d4f45..7f95539d 100644
--- a/baksmali/Android.bp
+++ b/baksmali/Android.bp
@@ -13,15 +13,6 @@
 // limitations under the License.
 
 //create a new baksmali.properties file using the correct version
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_smali_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-BSD
-    default_applicable_licenses: ["external_smali_license"],
-}
-
 genrule {
     name: "baksmali_version",
     srcs: [":smali_build.gradle"],
diff --git a/deodexerant/Android.bp b/deodexerant/Android.bp
index a1cd1b47..48d6fe29 100644
--- a/deodexerant/Android.bp
+++ b/deodexerant/Android.bp
@@ -27,15 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_smali_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-BSD
-    default_applicable_licenses: ["external_smali_license"],
-}
-
 cc_binary {
     name: "deodexerant",
 
diff --git a/dexlib2/Android.bp b/dexlib2/Android.bp
index e8eb04d5..4132d45c 100644
--- a/dexlib2/Android.bp
+++ b/dexlib2/Android.bp
@@ -15,16 +15,6 @@
 // build dexlib2 jar
 // ============================================================
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_smali_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    //   SPDX-license-identifier-BSD
-    default_applicable_licenses: ["external_smali_license"],
-}
-
 java_library_host {
     name: "dexlib2",
 
@@ -74,4 +64,4 @@ java_library_host {
         "jcommander",
         "jsr305",
     ],
-}
+}
\ No newline at end of file
diff --git a/smali/Android.bp b/smali/Android.bp
index 43cfea17..4bbfa1b5 100644
--- a/smali/Android.bp
+++ b/smali/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // 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_smali_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-BSD
-    default_applicable_licenses: ["external_smali_license"],
-}
-
 genrule {
     name: "smali_version",
     srcs: [":smali_build.gradle"],
diff --git a/util/Android.bp b/util/Android.bp
index 69678158..55f89eb9 100644
--- a/util/Android.bp
+++ b/util/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // 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_smali_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-BSD
-    default_applicable_licenses: ["external_smali_license"],
-}
-
 java_library_host {
     name: "smali-util",
     srcs: ["src/main/java/**/*.java"],