drm_hwcomposer: Merge 'aosp/upstream-main' into HEAD
Sync with upstream
* aosp/upstream-main:
drm_hwcomposer: Basic support for shared primary planes
drm_hwcomposer: check if the primary plane is being used by any crtc
drm_hwcomposer: fix BufferInfoImagination build
Change-Id: Id558c88c0f3b64e8c8bd33cb8d20f778ba610d85
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
diff --git a/Android.bp b/Android.bp
index 0de7e1c..a7a2e94 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,6 +15,23 @@
// =====================
// libdrmhwc_utils.a
// =====================
+package {
+ default_applicable_licenses: ["external_drm_hwcomposer_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "external_drm_hwcomposer_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
cc_library_static {
name: "libdrmhwc_utils",
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: NOTICE
+}
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..cead4fc
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,5 @@
+adelva@google.com
+dimitrysh@google.com
+jstultz@google.com
+marcheu@google.com
+seanpaul@google.com
diff --git a/tests/Android.bp b/tests/Android.bp
index c48c86a..f3ebb71 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -19,6 +19,15 @@
],
}
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_drm_hwcomposer_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["external_drm_hwcomposer_license"],
+}
+
cc_test {
name: "hwc-drm-tests",