Snap for 8426163 from ed4bc1eedea9e248f690ed682e4bd1b65863268d to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I9ff23f5174d5f4192a8f144375ae22394e4f53eb

2 files changed, 1 insertions, 23 deletions

diff --git a/Android.bp b/Android.bp
index d1a7625..fdc1eb4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,23 +17,6 @@
 //-------------------------------
 // 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,
@@ -60,11 +43,6 @@ 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",
@@ -82,3 +60,4 @@ java_import {
     jars: ["lib/assertj-core-1.7.1.jar"],
     host_supported: true,
 }
+
diff --git a/METADATA b/METADATA
index 7fdea5b..0fae97c 100644
--- a/METADATA
+++ b/METADATA
@@ -10,7 +10,6 @@ third_party {
     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