Snap for 8426163 from bc9bbf361c8cabbd4ae0a215de5871fad527915e 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: Ibedc596ab71cdd9845275110432ff4f6e1e3d1ba

3 files changed, 10 insertions, 42 deletions

diff --git a/Android.bp b/Android.bp
index ceca0b2..40fd9ac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,47 +14,6 @@
 // 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 90501a3..1aa20de 100644
--- a/METADATA
+++ b/METADATA
@@ -12,6 +12,5 @@ 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
new file mode 100644
index 0000000..e5b6e99
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,10 @@
+
+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.