drm_hwcomposer: Merge remote-tracking branch 'aosp/upstream-main' into HEAD
Just updates the branch to match upstream.
This merge contains a number of cleanups as well as
some follow-on fixups.
* aosp/upstream-main:
drm_hwcomposer: Don't close same handle several times.
drm_hwcomposer: Quiet noisy errors when planes don't support various attributes
drm_hwcomposer: Fix sync_file fd leak from "Rework audofd"
drm_hwcomposer: Add links to the HWC2 API description
drm_hwcomposer: Rework autofd
drm_hwcomposer: cleanup hwcutils
drm_hwcomposer: Stop importing native_handle_t into the mapper
drm_hwcomposer: Tracking of the DRM FB objects using RAII
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I9f733a6d9adb71b6c8b24d764e881904f66de146
diff --git a/Android.bp b/Android.bp
index ddf66fb..a4d8e18 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..75e29ae
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,5 @@
+adelva@google.com
+john.stultz@linaro.org
+marcheu@google.com
+seanpaul@google.com
+zachr@google.com
diff --git a/tests/Android.bp b/tests/Android.bp
index e30898c..473c944 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",
