diff options
author | Bob Badour <bbadour@google.com> | 2022-08-25 21:50:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-25 21:50:31 +0000 |
commit | ee890da55c82b95deca3518d5f3777e3d8ca9f0e (patch) | |
tree | 22a0f284bd5615c451ea918c1a272ab27e4be241 | |
parent | 4827d5d7da3ba0fa5a34222fa7e9e60dcd14b28c (diff) | |
parent | 9ce043038ebd1b9d1a3709d725e5fb92da4941a4 (diff) | |
download | pigweed-ee890da55c82b95deca3518d5f3777e3d8ca9f0e.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to external/pigweed am: e28811c304 am: 649a984458 am: 1a67778da4 am: 9ce043038eandroid-u-beta-1-gplmain-16k-with-phones
Original change: https://android-review.googlesource.com/c/platform/external/pigweed/+/2197515
Change-Id: I4403948bc187b3319bec1fca3c7c2f4e1db0242e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | NOTICE | 1 | ||||
-rw-r--r-- | pw_log/Android.bp | 9 | ||||
-rw-r--r-- | pw_log_android/Android.bp | 9 | ||||
-rw-r--r-- | pw_rpc/Android.bp | 9 |
5 files changed, 30 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 278042021..e123892fe 100644 --- a/Android.bp +++ b/Android.bp @@ -19,6 +19,8 @@ package { license { name: "external_pigweed_license", visibility: [":__subpackages__"], - license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], license_text: ["LICENSE"], } diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 6b1d0bfab..000000000 --- a/NOTICE +++ /dev/null @@ -1 +0,0 @@ -LICENSE diff --git a/pw_log/Android.bp b/pw_log/Android.bp index d9cadd4b8..fd4c7b14c 100644 --- a/pw_log/Android.bp +++ b/pw_log/Android.bp @@ -12,6 +12,15 @@ // License for the specific language governing permissions and limitations under // the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_pigweed_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_pigweed_license"], +} + cc_library { name: "libpw_log", vendor_available: true, diff --git a/pw_log_android/Android.bp b/pw_log_android/Android.bp index 179249e1a..b54e8a85e 100644 --- a/pw_log_android/Android.bp +++ b/pw_log_android/Android.bp @@ -12,6 +12,15 @@ // License for the specific language governing permissions and limitations under // the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_pigweed_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_pigweed_license"], +} + cc_library { name: "libpw_log_android", vendor_available: true, diff --git a/pw_rpc/Android.bp b/pw_rpc/Android.bp index 62f69dad8..fbd80605b 100644 --- a/pw_rpc/Android.bp +++ b/pw_rpc/Android.bp @@ -12,6 +12,15 @@ // License for the specific language governing permissions and limitations under // the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_pigweed_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_pigweed_license"], +} + java_library { name: "pw_rpc_java_client", srcs: ["java/main/dev/pigweed/pw_rpc/*.java"], |