summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-05 23:06:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-05 23:06:43 +0000
commit857b61ecbb94ba0d41c888f60196c75ace210ce1 (patch)
tree9df88c82f3605fdcacc6fc47b566743dd10dac74
parenta697fa29894f2dc1bde8d2357dfbe307ec93ef7c (diff)
parent2c7ccca634c03e8f9fe93cc102912682a1362164 (diff)
downloadeasel-857b61ecbb94ba0d41c888f60196c75ace210ce1.tar.gz
Original change: https://android-review.googlesource.com/c/platform/hardware/google/easel/+/1574718 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iac2a78d94fcd44ccbc16bf138c7d186356a1a74b
-rw-r--r--Android.bp29
-rw-r--r--amber/camera/Android.bp8
-rw-r--r--amber/camera/libhdrplusclient/Android.mk2
3 files changed, 39 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..474ca05
--- /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: ["hardware_google_easel_license"],
+}
+
+// Added automatically by a large-scale-change
+// http://go/android-license-faq
+license {
+ name: "hardware_google_easel_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ // large-scale-change unable to identify any license_text files
+}
diff --git a/amber/camera/Android.bp b/amber/camera/Android.bp
index d0d2dad..c72e035 100644
--- a/amber/camera/Android.bp
+++ b/amber/camera/Android.bp
@@ -14,6 +14,14 @@
* limitations under the License.
*/
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "hardware_google_easel_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["hardware_google_easel_license"],
+}
+
cc_library_headers {
name: "libhdrplusclient_headers",
proprietary: true,
diff --git a/amber/camera/libhdrplusclient/Android.mk b/amber/camera/libhdrplusclient/Android.mk
index e898824..5e89389 100644
--- a/amber/camera/libhdrplusclient/Android.mk
+++ b/amber/camera/libhdrplusclient/Android.mk
@@ -54,6 +54,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS += \
hardware/google/easel/amber/camera/include
LOCAL_MODULE:= libhdrplusclient
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_OWNER := google