aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-02-16 00:31:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-16 00:31:39 +0000
commit12f01ca87b79088edcc975a1c368b7125bec6c0a (patch)
tree9f03529024d8c45f1f5ea2850309edf9f7a4e8cd
parent66f0d92ee067b5033532aa70f02582a746460abd (diff)
parent0f3e77dd8560ebdeb978d79dbbbd04fe78b1c5a3 (diff)
downloadsample-12f01ca87b79088edcc975a1c368b7125bec6c0a.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to device/sample" am: bbc0dd02b7 am: 0f3e77dd85
Original change: https://android-review.googlesource.com/c/device/sample/+/1589079 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6c47ba7ce5c7f086e3da93b8cd2be25290e4c88f
-rw-r--r--Android.bp29
-rw-r--r--frameworks/PlatformLibrary/Android.bp9
-rw-r--r--frameworks/PlatformLibrary/Android.mk2
-rw-r--r--frameworks/PlatformLibrary/jni/Android.mk2
4 files changed, 42 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..f0da5bb
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,29 @@
+//
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+ default_applicable_licenses: ["device_sample_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "device_sample_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ // large-scale-change unable to identify any license_text files
+}
diff --git a/frameworks/PlatformLibrary/Android.bp b/frameworks/PlatformLibrary/Android.bp
index e78470f..7b3ec73 100644
--- a/frameworks/PlatformLibrary/Android.bp
+++ b/frameworks/PlatformLibrary/Android.bp
@@ -12,6 +12,15 @@
// See the 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 "device_sample_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["device_sample_license"],
+}
+
javadoc {
name: "platform_library-docs",
srcs: [
diff --git a/frameworks/PlatformLibrary/Android.mk b/frameworks/PlatformLibrary/Android.mk
index d4250af..db4c97c 100644
--- a/frameworks/PlatformLibrary/Android.mk
+++ b/frameworks/PlatformLibrary/Android.mk
@@ -33,6 +33,8 @@ LOCAL_MODULE_TAGS := optional
# This is the target being built.
LOCAL_MODULE:= com.example.android.platform_library
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_SDK_VERSION := current
include $(BUILD_JAVA_LIBRARY)
diff --git a/frameworks/PlatformLibrary/jni/Android.mk b/frameworks/PlatformLibrary/jni/Android.mk
index bd7ede0..1513f70 100644
--- a/frameworks/PlatformLibrary/jni/Android.mk
+++ b/frameworks/PlatformLibrary/jni/Android.mk
@@ -24,6 +24,8 @@ LOCAL_MODULE_TAGS := optional
# This is the target being built.
LOCAL_MODULE:= libplatform_library_jni
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS:= notice
# All of the source files that we will compile.
LOCAL_SRC_FILES:= \