drm_hwcomposer: Merge remote-tracking branch 'aosp/upstream-main' into HEAD
Sync AOSP's drm_hwcomposer branch to the upstream main branch.
This includes a number of fixes and cleanups from
Roman Stratiienko as well as fixes from Mauro Rossi.
* aosp/upstream-main:
drm_hwcomposer: Rework HwcDisplay disposal to avoid races
drm_hwcomposer: Add test utility to listen for uevents
drm_hwcomposer: Define DRM_FORMAT_XYUV8888 if missing
drm_hwcomposer: fix sign-compare building error in uevent listener
drm_hwcomposer: build with -std=c++17 cppflag
drm_hwcomposer: Rename DrmDisplayCompositor->DrmAtomicStateManager
drm_hwcomposer: Remove AtomicCommitArgs::clear_active_composition field
drm_hwcomposer: Remove RCAR-DU specific code.
drm_hwcomposer: Rework KMS composition planner + plane sharing support
drm_hwcomposer: Implement SetActiveConfigWithConstraints
drm_hwcomposer: Use single VSyncWorker per display
drm_hwcomposer: Dynamic DrmDisplayPipeline to HwcDisplay bindings
drm_hwcomposer: Initialize HwcDisplay using DrmDisplayPIpeline
drm_hwcomposer: Fix PipelineBindable::BindPipeline
drm_hwcomposer: Introduce DrmDisplayPipeline class
drm_hwcomposer: Tidy-up DrmDevice class
drm_hwcomposer: Tidy-up DrmConnector class
drm_hwcomposer: Tidy-up DrmEncoder class
drm_hwcomposer: Tidy-up DrmCrtc class
drm_hwcomposer: Remove ability to prioritize primary display
drm_hwcomposer: Handle primary display in GetDisplayConnectionType()
drm_hwcomposer: Tidy-up DrmPlane class
drm_hwcomposer: Simplify DrmHwcTwo::GetDisplay()
drm_hwcomposer: Fix build_deploy.sh script
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: Iba91e67371f4f1fc0a8cccf2ee97373898a5d195
diff --git a/Android.bp b/Android.bp
index dd6225d..c9c94af 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..dd8e743
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,5 @@
+adelva@google.com
+dimitrysh@google.com
+john.stultz@linaro.org
+marcheu@google.com
+seanpaul@google.com
diff --git a/tests/Android.bp b/tests/Android.bp
index e56ff5c..b25342e 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",