Snap for 7199817 from fdb4a727dcd95d303a18801c29fee75d0c5eceae to s-keystone-qcom-release
Change-Id: I88ee63ae90a3c2ad104f3bc4579e1a33164aab9e
diff --git a/Android.bp b/Android.bp
index 9f3a64d..443e837 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,36 @@
// This Blueprint file loosely follows the logic of cpu_features'
// CMakeLists.txt and test/CMakeLists.txt files.
+package {
+ default_applicable_licenses: ["external_cpu_features_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.
+// See: http://go/android-license-faq
+license {
+ name: "external_cpu_features_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ ],
+ license_text: [
+ "LICENSE",
+ ],
+}
+
cc_defaults {
name: "cpu_features-defaults",
host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 824f432..fbfe969 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,31 +1,15 @@
{
"presubmit": [
{
- "name": "cpu_features-bit_utils_test",
- "host": true
- },
- {
"name": "cpu_features-bit_utils_test"
},
{
- "name": "cpu_features-string_view_test",
- "host": true
- },
- {
"name": "cpu_features-string_view_test"
},
{
- "name": "cpu_features-stack_line_reader_test",
- "host": true
- },
- {
"name": "cpu_features-stack_line_reader_test"
},
{
- "name": "cpu_features-cpuinfo_test",
- "host": true
- },
- {
"name": "cpu_features-cpuinfo_test"
}
]