Snap for 7550930 from 18640beebb2fc91bc0ed96dcaf9b5fe3832f390b to mainline-resolv-releaseandroid-mainline-12.0.0_r94android-mainline-12.0.0_r80android-mainline-12.0.0_r65android-mainline-12.0.0_r52android-mainline-12.0.0_r35android-mainline-12.0.0_r16android-mainline-12.0.0_r124android-mainline-12.0.0_r108android12-mainline-resolv-release

Change-Id: Iede9ef3f34e951f1b55a92c33a6bb82074a3a231

3 files changed, 42 insertions, 10 deletions

diff --git a/Android.bp b/Android.bp
index 40fd9ac..ceca0b2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,47 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["external_arm-neon-tests_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_arm-neon-tests_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-1.1",
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-CPL-1.0",
+        "SPDX-license-identifier-EPL",
+        "SPDX-license-identifier-GPL-2.0",
+        "SPDX-license-identifier-LGPL-2.1",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: [
+        "LICENSE",
+        "license.html",
+    ],
+}
+
 cc_defaults {
     name: "arm_neon_tests_defaults",
     cflags: [
diff --git a/METADATA b/METADATA
index 1aa20de..90501a3 100644
--- a/METADATA
+++ b/METADATA
@@ -12,5 +12,6 @@ third_party {
     value: "https://github.com/christophe-lyon/arm-neon-tests.git"
   }
   version: "333ee3023f49a605e886e77c6e8c49bf655c81fb"
+  license_type: RESTRICTED
   last_upgrade_date { year: 2017 month: 11 day: 15 }
 }
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index e5b6e99..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,10 +0,0 @@
-
-License:
---------
-All files are covered by the MIT license, except for:
-retarget.c
-Init.s
-InitCache.s
-scatter.scat
-which are covered by ARM's EULA regarding "EXAMPLE CODE", as described
-in license.html.