aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-17 17:22:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-17 17:22:25 +0000
commitc9caaa96e5f51cee04d4a4b8d88349ba54258195 (patch)
tree63eb2263408829f915a3d3ff51a276574dbb6f4a
parent3663013059cdaf03a518f6a9940e28f9fa1c78fb (diff)
parent6d4dcf2744b988ee42af1dde143b06e89a31891d (diff)
downloadlibgsm-c9caaa96e5f51cee04d4a4b8d88349ba54258195.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libgsm" am: d7bf80d0ee am: e43fee5c0f am: 6d4dcf2744
Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/1588652 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7b2eb9351844af9dcf859151864cd46ef251e121
-rw-r--r--Android.bp31
-rw-r--r--fuzzer/Android.bp9
2 files changed, 40 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 567d1c2..a1468dd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,37 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["external_libgsm_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_libgsm_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-0BSD",
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ ],
+ license_text: [
+ "COPYRIGHT",
+ ],
+}
+
cc_library_static {
name: "libgsm",
vendor_available: true,
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 3668a6f..3dc0524 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -18,6 +18,15 @@
* Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
*/
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_libgsm_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["external_libgsm_license"],
+}
+
cc_defaults {
name: "gsm_fuzzer_defaults",
host_supported: true,