summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-20 17:23:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-20 17:23:06 +0000
commit6148ac6a7bd1eefaf9fa407a3506d7fa655fbb6c (patch)
tree269fc85be5dac18ab294673a3213e8dcfacb81f8
parent3c40af86ad90d04c6e8e7235dff9e46a21035fd8 (diff)
parentceef745b854b78638256f016e09dabc5f4baa2a5 (diff)
downloadinterfaces-6148ac6a7bd1eefaf9fa407a3506d7fa655fbb6c.tar.gz
[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/interfaces am: b508851c29 am: 2060418494 am: ceef745b85
Original change: https://android-review.googlesource.com/c/platform/hardware/google/interfaces/+/1588377 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I316479562c77833911eabb4cf6870c8712fd0da6
-rw-r--r--Android.bp15
-rw-r--r--display/Android.bp9
-rw-r--r--light/1.0/Android.bp9
-rw-r--r--light/1.0/default/Android.bp9
-rw-r--r--light/1.1/Android.bp9
-rw-r--r--light/1.1/default/Android.bp9
-rw-r--r--media/c2/1.0/Android.bp10
-rw-r--r--power/Android.bp9
8 files changed, 78 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index cbe5e32..d97115f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,21 @@
soong_namespace {
}
+package {
+ default_applicable_licenses: ["hardware_google_interfaces_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "hardware_google_interfaces_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ // large-scale-change unable to identify any license_text files
+}
+
hidl_package_root {
name: "hardware.google",
}
diff --git a/display/Android.bp b/display/Android.bp
index 78c2885..f48a528 100644
--- a/display/Android.bp
+++ b/display/Android.bp
@@ -1,3 +1,12 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "hardware_google_interfaces_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["hardware_google_interfaces_license"],
+}
+
aidl_interface {
name: "com.google.hardware.pixel.display",
vendor_available: true,
diff --git a/light/1.0/Android.bp b/light/1.0/Android.bp
index 560b3d1..c2e0efb 100644
--- a/light/1.0/Android.bp
+++ b/light/1.0/Android.bp
@@ -1,5 +1,14 @@
// This file is autogenerated by hidl-gen -Landroidbp.
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "hardware_google_interfaces_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["hardware_google_interfaces_license"],
+}
+
hidl_interface {
name: "hardware.google.light@1.0",
root: "hardware.google",
diff --git a/light/1.0/default/Android.bp b/light/1.0/default/Android.bp
index 7ca84cd..af11738 100644
--- a/light/1.0/default/Android.bp
+++ b/light/1.0/default/Android.bp
@@ -14,6 +14,15 @@
// 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 "hardware_google_interfaces_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["hardware_google_interfaces_license"],
+}
+
cc_defaults {
name: "hardware.google.light_defaults",
relative_install_path: "hw",
diff --git a/light/1.1/Android.bp b/light/1.1/Android.bp
index 3b6fdf9..8fce321 100644
--- a/light/1.1/Android.bp
+++ b/light/1.1/Android.bp
@@ -1,5 +1,14 @@
// This file is autogenerated by hidl-gen -Landroidbp.
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "hardware_google_interfaces_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["hardware_google_interfaces_license"],
+}
+
hidl_interface {
name: "hardware.google.light@1.1",
root: "hardware.google",
diff --git a/light/1.1/default/Android.bp b/light/1.1/default/Android.bp
index a6b1e5d..783e6c2 100644
--- a/light/1.1/default/Android.bp
+++ b/light/1.1/default/Android.bp
@@ -14,6 +14,15 @@
// 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 "hardware_google_interfaces_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["hardware_google_interfaces_license"],
+}
+
cc_defaults {
name: "hardware.google.light_defaults-1.1",
relative_install_path: "hw",
diff --git a/media/c2/1.0/Android.bp b/media/c2/1.0/Android.bp
index 01da299..3838dc7 100644
--- a/media/c2/1.0/Android.bp
+++ b/media/c2/1.0/Android.bp
@@ -1,5 +1,14 @@
// This file is autogenerated by hidl-gen -Landroidbp.
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "hardware_google_interfaces_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["hardware_google_interfaces_license"],
+}
+
hidl_interface {
name: "hardware.google.media.c2@1.0",
root: "hardware.google",
@@ -23,4 +32,3 @@ hidl_interface {
],
gen_java: false,
}
-
diff --git a/power/Android.bp b/power/Android.bp
index 5beaf51..d0972c0 100644
--- a/power/Android.bp
+++ b/power/Android.bp
@@ -1,3 +1,12 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "hardware_google_interfaces_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["hardware_google_interfaces_license"],
+}
+
aidl_interface {
name: "pixel-power-ext",
vendor_available: true,