Snap for 7803083 from c9c1692ff1ab5b27e574c3c75051aba4deb00d53 to mainline-tzdata2-release
Change-Id: Ia272f4e5f8557a66921243bafde34cae28b9a495
diff --git a/Android.bp b/Android.bp
index fdc1eb4..d1a7625 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,6 +17,23 @@
//-------------------------------
// build a target jar
+package {
+ default_applicable_licenses: ["external_junit-params_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "external_junit-params_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ license_text: [
+ "LICENSE.txt",
+ ],
+}
+
java_library {
name: "junit-params",
host_supported: true,
@@ -43,6 +60,11 @@
java_test {
name: "junit-params-test",
host_supported: true,
+ // Don't consider those unit tests, they would be hard to maintain since they are
+ // from external, and have dependencies on the junit version.
+ test_options: {
+ unit_test: false,
+ },
srcs: ["src/test/java/**/*.java"],
java_resource_dirs: ["src/test/resources"],
sdk_version: "core_current",
@@ -60,4 +82,3 @@
jars: ["lib/assertj-core-1.7.1.jar"],
host_supported: true,
}
-
diff --git a/METADATA b/METADATA
index 0fae97c..7fdea5b 100644
--- a/METADATA
+++ b/METADATA
@@ -10,6 +10,7 @@
value: "https://github.com/Pragmatists/JUnitParams/archive/JUnitParams-1.0.5.tar.gz"
}
version: "JUnitParams-1.0.5"
+ license_type: NOTICE
last_upgrade_date {
year: 2016
month: 4
