Merge remote-tracking branch 'gitlab/main' into HEAD
This updates the AOSP/master branch to include the current
upstream gitlab/main branch, which includes a fair amount of
updates.
Most are connected to the gitlab CI improvements, but there
are also a fair amount of code cleanups and new functionality
like composer@2.4 support.
* gitlab/main:
drm_hwcomposer: update README for clang-format-diff-11 and touch up formatting
drm_hwcomposer: remove unused variable blend
drm_hwcomposer: reject rotations reported as unsupported by hardware
drm_hwcomposer: add DRM_PROPERTY_TYPE_BITMASK
drm_hwcomposer: Fix regression after composition creation cleanup
drm_hwcomposer: Move ValidatePlane method into DrmPlane
drm_hwcomposer: Remove useless setters from DrmHwcLayer
drm_hwcomposer: Add GetOrderLayersByZPos method
drm_hwcomposer: Move HardwareSupportsLayerType into Backend
drm_hwcomposer: Move MarkValidated into Backend
drm_hwcomposer: Add GetExtraClientRange method
drm_hwcomposer: Move CalcPixOps into Backend
drm_hwcomposer: Remove ctrc from DrmCompositionPlane
drm_hwcomposer: Remove SquashState class declaration
drm_hwcomposer: Remove DrmCompositionDisplayLayersMap
drm_hwcomposer: Remove DrmCompositionRegion struct
drm_hwcomposer: Cleanup DrmDisplayComposition initialization
drm_hwcomposer: CI: Increase coverage
drm_hwcomposer: CI: Pull headers from the AOSPv11
drm_hwcomposer: Fix client range selection logic
drm_hwcomposer: Remove writeback-based flattening logic
drm_hwcomposer: add missing HAL pixel format
drm_hwcomposer: CI: Add more source files to the build
drm_hwcomposer: clang-tidy: enable cppcoreguidelines-* checks
drm_hwcomposer: clang-tidy: enable clang-analyzer-* checks
drm_hwcomposer: enable code analysis using clang-tidy
drm_hwcomposer: CI: Use bpfmt to check Android.bp files style
drm_hwcomposer: CI: Initial build and clang-tidy checks
drm_hwcomposer: CI: Use clang-11 for the CI
drm_hwcomposer: Create make target to test filegroups
drm_hwcomposer: Fix drmSetMaster() usage
drm_hwcomposer: Initial composer@2.4 HAL support
drm_hwcomposer: Add support for color encoding and range properties
drm_hwcomposer: Add minigbm video and format_modifier support
drm_hwcomposer: Support unique fd for every YUV plane
drm_hwcomposer: Ensure composer has master access to DRM/KMS
drm_hwcomposer: Reorganize modifiers handling logic
drm_hwcomposer: libdrmgetter: fix RGB565 format translation
Change-Id: I3a9801bd858bc869844ac5d2d81383767029b09e
Signed-off-by: John Stultz <john.stultz@linaro.org>
diff --git a/Android.bp b/Android.bp
index 9bed9e4..d3c812d 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",