diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 00:31:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 00:31:38 +0000 |
| commit | fc7153a807822c1c43b8e21c4785e160e2e2455a (patch) | |
| tree | 9788658fa18e8e9e854407f7da7b1793ac9bb04e | |
| parent | 46a5c62c6763f054fce88ab6737983014de66226 (diff) | |
| parent | 34fe745f428cccefe4775bcb92c63a238ca1cfa8 (diff) | |
| download | sdk-fc7153a807822c1c43b8e21c4785e160e2e2455a.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk" am: 6e37a45f64 am: 34fe745f42
Original change: https://android-review.googlesource.com/c/platform/sdk/+/1589083
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib240d48daf3bf658339841c6d8a71b749da4d14b
| -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", |