commit 920d71bc794b03cf6dd5446f521bffd17c329826
author Naseer Ahmed <naseer@codeaurora.org> Thu Mar 08 16:54:28 2018 -0500
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 25 13:35:13 2018 -0700
tree 74715a068ed1fe4401d8e64f66dabb0fb516ae37
parent cbbc57eeeff407de6a0c5fa59ccc4da31a2a6016

gralloc: Implement IMapper::2.1

Implements the new IMapper v2.1 APIs
Passes VTS for IMapper v2.1

Change-Id: I9762cd056a296c522ab3446408c3c4c5434b3dc4

sdm/libs/hwc2/Android.mk

diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk
index 483d7e7..253531c 100644
--- a/sdm/libs/hwc2/Android.mk
+++ b/sdm/libs/hwc2/Android.mk
@@ -21,7 +21,9 @@
                                  libutils libcutils libsync libqdutils libqdMetaData \
                                  libdisplaydebug libsdmutils libc++ liblog libgrallocutils libui \
                                  libgpu_tonemapper libhidlbase libhidltransport \
-                                 vendor.display.config@1.0 android.hardware.graphics.mapper@2.0 \
+                                 vendor.display.config@1.0 \
+                                 android.hardware.graphics.mapper@2.0 \
+                                 android.hardware.graphics.mapper@2.1 \
                                  android.hardware.graphics.allocator@2.0
 
 ifeq ($(display_config_version), DISPLAY_CONFIG_1_1)

sdm/libs/hwc2/hwc_buffer_allocator.h

diff --git a/sdm/libs/hwc2/hwc_buffer_allocator.h b/sdm/libs/hwc2/hwc_buffer_allocator.h
index d6f251f..cec5614 100644
--- a/sdm/libs/hwc2/hwc_buffer_allocator.h
+++ b/sdm/libs/hwc2/hwc_buffer_allocator.h
@@ -33,7 +33,7 @@
 #include <sys/mman.h>
 
 #include <android/hardware/graphics/allocator/2.0/IAllocator.h>
-#include <android/hardware/graphics/mapper/2.0/IMapper.h>
+#include <android/hardware/graphics/mapper/2.1/IMapper.h>
 #include "gralloc_priv.h"
 
 using android::hardware::graphics::allocator::V2_0::IAllocator;