summaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2022-01-26 04:40:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-26 04:40:22 +0000
commitbf4e2386239e5fda835a978b33e6377c8aa636b0 (patch)
treefd01bd44ef0093c06e1759c6dab39291c55e9a51 /Android.bp
parent6d4e2d94d91ff65d023af066e14684883c1d9bc8 (diff)
parentfc1ad1d68613a3cb7b23b3f06687a5e26be70960 (diff)
Fix license texts. am: 48ec29f463 am: f5560dd4b9 am: 243259d8d3 am: fc1ad1d686
Original change: https://android-review.googlesource.com/c/platform/hardware/google/gchips/+/1959712 Change-Id: Icbcefd2fe5066f0c17f05ed21f4134aefbba6fba
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp25
1 files changed, 6 insertions, 19 deletions
diff --git a/Android.bp b/Android.bp
index e194922..c54a46a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -7,31 +7,18 @@ soong_namespace {
}
package {
- default_applicable_licenses: ["hardware_google_gchips_license"],
+ default_applicable_licenses: [
+ "Android-Apache-2.0",
+ "hardware_google_gchips_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: "hardware_google_gchips_license",
visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-GPL-2.0",
- ],
- // large-scale-change unable to identify any license_text files
+ license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+ license_text: ["LICENSE"],
}
cc_library_headers {