Fix licenses and license texts.
Some BSD, some CC-BY, mostly Apache 2.0 & 1p
Test: m nothing
Change-Id: Idfeeb926656fec61e9753a5a55b13c5cdf2d8651
diff --git a/Android.bp b/Android.bp
index 27c5b2f..de90412 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,23 +1,14 @@
package {
- default_applicable_licenses: ["packages_apps_Contacts_license"],
+ default_applicable_licenses: [
+ "packages_apps_Contacts_license",
+ "Android-Apache-2.0",
+ ],
}
-// 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_Contacts_license",
+ package_name: "Android Contacts App",
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",