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

Change-Id: Id17e251daa8c0f3385850160420b841985415432

2 files changed, 37 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 01b80f7..11252fc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,42 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["external_apache-commons-math_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_apache-commons-math_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+    ],
+    license_text: [
+        "LICENSE",
+        "NOTICE",
+    ],
+}
+
 java_library {
     name: "apache-commons-math",
     host_supported: true,
diff --git a/METADATA b/METADATA
index a8d4e43..7e16c88 100644
--- a/METADATA
+++ b/METADATA
@@ -11,7 +11,7 @@ third_party {
     value: "https://github.com/apache/commons-math/archive/MATH_2_2.zip"
   }
   version: "MATH_2_2"
-  license_type: RECIPROCAL
+  license_type: NOTICE
   last_upgrade_date {
     year: 2011
     month: 3