Snap for 7183507 from d876368f00bc79dd0b047caf2785671498dc2f2c to sdk-releaseplatform-tools-31.0.3platform-tools-31.0.2platform-tools-31.0.1

Change-Id: I38c1ebeb2384fa3e9b9af56d3ae315f6dfa8a024

1 files changed, 22 insertions, 1 deletions

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_library_host {
 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 @@ java_import {
     jars: ["lib/assertj-core-1.7.1.jar"],
     host_supported: true,
 }
-