Merge remote-tracking branch 'aosp/upstream-main' into uprev am: 3b2a47f6a5
Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/3392347
Change-Id: I0aeb1e1ae7e0387a65df3d7addef05fc5bad1f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index c9ec63f..24d4d99 100644
--- a/Android.bp
+++ b/Android.bp
@@ -195,7 +195,7 @@
],
shared_libs: [
- "android.hardware.graphics.composer3-V3-ndk",
+ "android.hardware.graphics.composer3-V4-ndk",
"libbase",
"libbinder_ndk",
"liblog",
diff --git a/hwc3/hwc3-drm.xml b/hwc3/hwc3-drm.xml
index 911f7f8..7debcf9 100644
--- a/hwc3/hwc3-drm.xml
+++ b/hwc3/hwc3-drm.xml
@@ -1,7 +1,7 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.graphics.composer3</name>
- <version>3</version>
+ <version>4</version>
<interface>
<name>IComposer</name>
<instance>default</instance>