aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-06-23 14:49:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-23 14:49:59 +0000
commit7c3ba23d88b77de7fcd6151fe95efec08de43f6b (patch)
tree07b60ea8805090a47c79b7343c0b203e1b3ef5fb
parentcd5e9c06e460ecfa1f0a5eff80c0cc7c0329002a (diff)
parent694bc1b4a7bced71500c9c3302b07fb692105651 (diff)
downloadTV-7c3ba23d88b77de7fcd6151fe95efec08de43f6b.tar.gz
Add license_text res/raw/third_party_licenses am: 18ae36961d am: 694bc1b4a7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1743620 Change-Id: I8d89075bf1a97ce20a5880426065215860fba082
-rw-r--r--Android.bp15
1 files changed, 1 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp
index d6af0655..2d956ba6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,19 +18,6 @@ package {
default_applicable_licenses: ["packages_apps_TV_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: "packages_apps_TV_license",
@@ -40,7 +27,7 @@ license {
"SPDX-license-identifier-BSD",
"SPDX-license-identifier-MIT",
],
- // large-scale-change unable to identify any license_text files
+ license_text: ["res/raw/third_party_licenses"],
}
version_name = "1.24-asop"