Snap for 7550844 from 42ce5e207df349e02ecd7b70137eac2583ee685f to mainline-os-statsd-release
Change-Id: I00ad780dd77ef929e38d7c639ea014a6072b7478
diff --git a/Android.bp b/Android.bp
index d104f3d..f1b0573 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 @@
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 010701d..521ada3 100644
--- a/METADATA
+++ b/METADATA
@@ -10,6 +10,7 @@
value: "https://github.com/google/guice/archive/4.2.tar.gz"
}
version: "4.2"
+ license_type: NOTICE
last_upgrade_date {
year: 2018
month: 8
