Fix license texts.
BSD license text extracted from source header.
All else is Android-Apache-2.0; except, some have NAC added without new
license terms.
Test: m nothing
Change-Id: If44ec3151c22359fbba6c15ea3a6d665fe80c08f
diff --git a/Android.bp b/Android.bp
index c19b607..1a277ad 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,32 +14,19 @@
package {
- default_applicable_licenses: ["frameworks_opt_telephony_license"],
+ // See: http://go/android-license-faq
+ default_applicable_licenses: [
+ "Android-Apache-2.0",
+ "frameworks_opt_telephony_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: "frameworks_opt_telephony_license",
visibility: [":__subpackages__"],
license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
"legacy_not_a_contribution",
],
- // large-scale-change unable to identify any license_text files
}
filegroup {
diff --git a/tests/telephonytests/Android.bp b/tests/telephonytests/Android.bp
index 5345b42..9d9d1fe 100644
--- a/tests/telephonytests/Android.bp
+++ b/tests/telephonytests/Android.bp
@@ -1,11 +1,16 @@
package {
// See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "frameworks_opt_telephony_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- // SPDX-license-identifier-BSD
- default_applicable_licenses: ["frameworks_opt_telephony_license"],
+ default_applicable_licenses: [
+ "frameworks_opt_telephony_tests_telephonytests_license",
+ "Android-Apache-2.0",
+ ],
+}
+
+license {
+ name: "frameworks_opt_telephony_tests_telephonytests_license",
+ package_name: "Android Telephone Tests",
+ license_kinds: ["SPDX-license-identifier-BSD"],
+ license_text: ["LICENSE_BSD"],
}
android_test {
diff --git a/tests/telephonytests/LICENSE_BSD b/tests/telephonytests/LICENSE_BSD
new file mode 100644
index 0000000..820d40c
--- /dev/null
+++ b/tests/telephonytests/LICENSE_BSD
@@ -0,0 +1,26 @@
+Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.