Snap for 7468467 from 42ce5e207df349e02ecd7b70137eac2583ee685f to mainline-mediaprovider-releaseandroid-mainline-12.0.0_r90android-mainline-12.0.0_r76android-mainline-12.0.0_r48android-mainline-12.0.0_r31android-mainline-12.0.0_r121android-mainline-12.0.0_r11android-mainline-12.0.0_r106aml_mpr_311911090android12-mainline-mediaprovider-release

Change-Id: I41171236cb509136fd31c8277bf3a4acc37bdd2f

2 files changed, 25 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index d104f3d9..f1b0573c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,6 +27,29 @@
 // -- see core/pom.xml NO_AOP rule.
 //
 
+package {
+    default_applicable_licenses: ["external_guice_license"],
+}
+
+// Added automatically by a large-scale-change
+//
+// 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_guice_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "COPYING",
+        "NOTICE",
+    ],
+}
+
 filegroup {
     name: "guice_srcs",
     srcs: ["core/src/**/*.java"],
@@ -58,7 +81,7 @@ genrule {
     name: "guice_munge_srcjar",
     out: ["guice_munge.srcjar"],
     srcs: ["lib/build/munge.jar"],
-    cmd: "zip --temp-path $${TMPDIR:-/tmp} $(in) -O $(out) -d MungeTask.java",
+    cmd: "zip -q --temp-path $${TMPDIR:-/tmp} $(in) -O $(out) -d MungeTask.java *.class",
 }
 
 genrule {
diff --git a/METADATA b/METADATA
index 010701d0..521ada38 100644
--- a/METADATA
+++ b/METADATA
@@ -10,6 +10,7 @@ third_party {
     value: "https://github.com/google/guice/archive/4.2.tar.gz"
   }
   version: "4.2"
+  license_type: NOTICE
   last_upgrade_date {
     year: 2018
     month: 8