Merge remote-tracking branch 'aosp/upstream-main' into HEAD
Update AOSP to the latest upstream-main branch.
This includes fixes for multiplane formats like NV12,
as well as lots of cleanups from Roman.
* aosp/upstream-main: (26 commits)
drm_hwcomposer: Rework UserPropertyBlob to use RAII
drm_hwcomposer: Move GetPlaneProperty into DrmPlane class
drm_hwcomposer: Remove unused DrmDisplayCompositor class fields
drm_hwcomposer: Remove unused {DrmComposition,DrmCompositor}::Dump()
drm_hwcomposer: Move client flattening closer to the frontend
drm_hwcomposer: Allow pre-multi layer to always pass DrmPlane validation
drm_hwcomposer: Improve Mapper@4 metadata API fds index guessing logic
drm_hwcomposer: Add support for VSYNC_2_4 callback
drm_hwcomposer: Handle all HWC2 callbacks in DrmHwcTwo.{h,cpp}
drm_hwcomposer: Move rotation enum querying into DrmPlane initialization
drm_hwcomposer: Cleanup DrmPlane::Init()
drm_hwcomposer: DrmPlane: More atomic commit cleanup
drm_hwcomposer: Remove unused cursor_{x,y}_ and layer_color_ variables
drm_hwcomposer: Convert transform value at HWC hook call
drm_hwcomposer: Improve handling of blending mode
drm_hwcomposer: Query color_encoding and color_range enums during init
drm_hwcomposer: Create intermediate enum for colorspace and samplerange
drm_hwcomposer: Move plane-related atomic commit logic to DrmPlane class
drm_hwcomposer: Move IsKMSDev to DrmDevice
drm_hwcomposer: Remove unused AvailableWritebackConnector()
...
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I6fe0c6887e1927a44cc3cb7c2c32e2195da148d3
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",