diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 01:02:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 01:02:08 +0000 |
commit | b3f92fe65cc033dc02107cc127e0ae0e2a50a967 (patch) | |
tree | 9788658fa18e8e9e854407f7da7b1793ac9bb04e | |
parent | 7532f1a99bc17a82ae8b6714025facb3095c08b1 (diff) | |
parent | fc7153a807822c1c43b8e21c4785e160e2e2455a (diff) | |
download | sdk-b3f92fe65cc033dc02107cc127e0ae0e2a50a967.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk" am: 6e37a45f64 am: 34fe745f42 am: fc7153a807android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-release
Original change: https://android-review.googlesource.com/c/platform/sdk/+/1589083
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b801c6244b415a543b09d4c2c021637cfe04391
-rw-r--r-- | annotations/Android.bp | 17 | ||||
-rw-r--r-- | dumpeventlog/Android.bp | 17 | ||||
-rw-r--r-- | eventanalyzer/Android.bp | 17 | ||||
-rw-r--r-- | hierarchyviewer/Android.bp | 4 | ||||
-rw-r--r-- | hierarchyviewer/etc/Android.bp | 4 |
5 files changed, 59 insertions, 0 deletions
diff --git a/annotations/Android.bp b/annotations/Android.bp index 35a0d58fa..05b9e291d 100644 --- a/annotations/Android.bp +++ b/annotations/Android.bp @@ -14,6 +14,23 @@ // limitations under the License. // +package { + default_applicable_licenses: ["sdk_annotations_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "sdk_annotations_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + java_library_host { name: "annotations", diff --git a/dumpeventlog/Android.bp b/dumpeventlog/Android.bp index 618446f83..7ebe4c04f 100644 --- a/dumpeventlog/Android.bp +++ b/dumpeventlog/Android.bp @@ -1,6 +1,23 @@ // Copyright 2007 The Android Open Source Project // +package { + default_applicable_licenses: ["sdk_dumpeventlog_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "sdk_dumpeventlog_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + java_binary_host { name: "dumpeventlog", diff --git a/eventanalyzer/Android.bp b/eventanalyzer/Android.bp index 40f8276ab..3fa8ab00d 100644 --- a/eventanalyzer/Android.bp +++ b/eventanalyzer/Android.bp @@ -14,6 +14,23 @@ // limitations under the License. // +package { + default_applicable_licenses: ["sdk_eventanalyzer_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "sdk_eventanalyzer_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + java_binary_host { name: "eventanalyzer", diff --git a/hierarchyviewer/Android.bp b/hierarchyviewer/Android.bp index 69134f0a6..5f94b3d2b 100644 --- a/hierarchyviewer/Android.bp +++ b/hierarchyviewer/Android.bp @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_library_host { name: "hierarchyviewer", diff --git a/hierarchyviewer/etc/Android.bp b/hierarchyviewer/etc/Android.bp index c1d852510..82ba8e811 100644 --- a/hierarchyviewer/etc/Android.bp +++ b/hierarchyviewer/etc/Android.bp @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + sh_binary_host { name: "hierarchyviewer1", src: "hierarchyviewer1", |