mirror of https://github.com/mstorsjo/fdk-aac.git
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f
am: 7ad87e81d7
am: 2020366ce7
am: 24a33f559c
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8b242f3f29aaba1a2b75deddf80c1caf967181b8
This commit is contained in:
commit
69179af1ee
33
Android.bp
33
Android.bp
|
@ -1,3 +1,36 @@
|
||||||
|
// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE
|
||||||
|
// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
|
||||||
|
// DEPENDING ON IT IN YOUR PROJECT. ***
|
||||||
|
package {
|
||||||
|
default_applicable_licenses: ["external_aac_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_aac_license",
|
||||||
|
visibility: [":__subpackages__"],
|
||||||
|
license_kinds: [
|
||||||
|
"SPDX-license-identifier-Apache-2.0",
|
||||||
|
"legacy_by_exception_only", // by exception only
|
||||||
|
],
|
||||||
|
license_text: [
|
||||||
|
"NOTICE",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
cc_library_static {
|
cc_library_static {
|
||||||
name: "libFraunhoferAAC",
|
name: "libFraunhoferAAC",
|
||||||
vendor_available: true,
|
vendor_available: true,
|
||||||
|
|
|
@ -18,6 +18,15 @@
|
||||||
* Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
|
* 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_aac_license"
|
||||||
|
// to get the below license kinds:
|
||||||
|
// SPDX-license-identifier-Apache-2.0
|
||||||
|
default_applicable_licenses: ["external_aac_license"],
|
||||||
|
}
|
||||||
|
|
||||||
cc_defaults {
|
cc_defaults {
|
||||||
name: "aac_fuzz_defaults",
|
name: "aac_fuzz_defaults",
|
||||||
host_supported: true,
|
host_supported: true,
|
||||||
|
|
Loading…
Reference in New Issue