Snap for 7550844 from ee742e65532c1e8054f680e1a063950b4a25b7ff to mainline-conscrypt-releaseandroid-mainline-12.0.0_r8android-mainline-12.0.0_r25android12-mainline-conscrypt-release

Change-Id: Ib181eccc3f5ddebaaa0d0fccbc44ba71d17f6039

2 files changed, 48 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index d15b6f3..6d4619b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,6 +15,46 @@
 // build caliper host jar
 // ============================================================
 
+package {
+    default_applicable_licenses: ["external_caliper_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+//
+// 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_caliper_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-CDDL",
+        "SPDX-license-identifier-CDDL-1.0",
+        "SPDX-license-identifier-GPL",
+        "SPDX-license-identifier-GPL-2.0",
+        "SPDX-license-identifier-LGPL",
+    ],
+    license_text: [
+        "COPYING",
+        "NOTICE",
+    ],
+}
+
 java_library_host {
     name: "caliper",
 
@@ -25,8 +65,8 @@ java_library_host {
         "apache-commons-math",
         "caliper-prebuilts",
         "dagger2",
-        "dagger2-inject",
         "guava",
+        "jsr330",
     ],
 
     // Use Dagger2 annotation processor
@@ -73,6 +113,11 @@ java_test_host {
         "junit",
         "mockito",
     ],
+    // Avoid the tests running as unit tests. They have some jar requirement that doesn't currently
+    // quite work in CI.
+    test_options: {
+        unit_test: false,
+    },
 
     // Use Dagger2 annotation processor
     plugins: ["dagger2-compiler"],
diff --git a/METADATA b/METADATA
index 0e79ebf..4c46726 100644
--- a/METADATA
+++ b/METADATA
@@ -11,6 +11,8 @@ third_party {
     value: "https://github.com/google/caliper/archive/73efbe138dafba57d6a890257961ba83f41b89f2.zip"
   }
   version: "73efbe138dafba57d6a890257961ba83f41b89f2"
+  # would be NOTICE save for lib/*.jar.txt
+  license_type: RESTRICTED
   last_upgrade_date {
     year: 2015
     month: 11