From 7ec1289084c40d5b5e4d257f11a81a9c8ae633c5 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Thu, 23 Apr 2020 16:45:20 -0700
Subject: Add license type: Apache2 is a NOTICE license

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I2d13889e4d808a85e0945788e27cd4640cdee1bd
---
 METADATA | 1 +
 1 file changed, 1 insertion(+)

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
-- 
cgit v1.2.3


From 9f85ddebcfd52527e5ebf282dbe813cb003fa0aa Mon Sep 17 00:00:00 2001
From: Luca Stefani <luca.stefani.ge1@gmail.com>
Date: Sat, 25 Jul 2020 21:10:35 +0200
Subject: guice: Make guice_munge_srcjar generation quiet

Change-Id: I3ec294af337f8ed80a0521190157fe1aef478125
---
 Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index d104f3d9..941c891c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,7 +58,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",
 }
 
 genrule {
-- 
cgit v1.2.3


From a3c7060e68d73ba4962673ff81b9a4937aef6742 Mon Sep 17 00:00:00 2001
From: Luca Stefani <luca.stefani.ge1@gmail.com>
Date: Sun, 26 Jul 2020 10:23:34 +0200
Subject: guice: Remove .class files from srcjar

* They don't belong in a srcjar

Change-Id: I63a3731ec25cb433cd4fa4ddf6c806b7fb32e311
---
 Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 941c891c..0373db25 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,7 +58,7 @@ genrule {
     name: "guice_munge_srcjar",
     out: ["guice_munge.srcjar"],
     srcs: ["lib/build/munge.jar"],
-    cmd: "zip -q --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 {
-- 
cgit v1.2.3


From 656c2489c015f82f79c5ebe360757179b9585576 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Fri, 12 Feb 2021 15:42:49 -0800
Subject: [LSC] Add LOCAL_LICENSE_KINDS to external/guice

Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I048d375468fd647af015eb338b698c3ead4a1f8a
---
 Android.bp | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Android.bp b/Android.bp
index 0373db25..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"],
-- 
cgit v1.2.3