Add drm hwc support am: eebe4a5562 am: 1ad4d16180 am: 2fb5135b44r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100

Change-Id: I5caf7cd0aa5962eb5c20a6a70452d9557b65c5a5

5 files changed, 3 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 347ce1c..9515b25 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,2 @@
 soong_namespace {
 }
-
diff --git a/libhwcomposer/drmfb.cpp b/libhwcomposer/drmfb.cpp
index 0421050..b6d1f64 100644
--- a/libhwcomposer/drmfb.cpp
+++ b/libhwcomposer/drmfb.cpp
@@ -23,7 +23,7 @@
 
 #include "drmfb.h"
 #include "format.h"
-#include "hal_public.h"
+#include "img_gralloc1_public.h"
 
 DRMFramebuffer::DRMFramebuffer(int drm_fd, buffer_handle_t handle, bool is_overlay) :
     bo(), pitches(), offsets()
diff --git a/libhwcomposer/format.cpp b/libhwcomposer/format.cpp
index c0f469a..5a39907 100644
--- a/libhwcomposer/format.cpp
+++ b/libhwcomposer/format.cpp
@@ -21,7 +21,7 @@
 #include <linux/types.h>
 
 #include "format.h"
-#include "hal_public.h"
+#include "img_gralloc1_public.h"
 
 bool is_valid_format(uint32_t format)
 {
diff --git a/libhwcomposer/format.h b/libhwcomposer/format.h
index 731c53a..633c704 100644
--- a/libhwcomposer/format.h
+++ b/libhwcomposer/format.h
@@ -23,7 +23,7 @@
 #include <drm/drm_fourcc.h>
 #include <linux/types.h>
 
-#include "hal_public.h"
+#include "img_gralloc1_public.h"
 
 static inline std::string HAL_FMT(uint32_t format)
 {
diff --git a/libhwcomposer/hal_public.h b/libhwcomposer/img_gralloc1_public.h
index 5ca9bd2..5ca9bd2 100644
--- a/libhwcomposer/hal_public.h
+++ b/libhwcomposer/img_gralloc1_public.h