summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-18 20:07:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-18 20:07:45 +0000
commit2fb5135b44a11ea3b586d7cbf1d6bb99940c6044 (patch)
treec3609901810c5636883da56924cb5c7dfe4a2102
parent848b54cabd8407b9571c89bdc027899535fa577a (diff)
parent1ad4d16180be49d513f715688c5d4bacf931b8b1 (diff)
downloadam57x-2fb5135b44a11ea3b586d7cbf1d6bb99940c6044.tar.gz
Add drm hwc support am: eebe4a5562 am: 1ad4d16180android-r-preview-4android-r-preview-3android-r-preview-2
Change-Id: I22f937245806cc3795f8b7ce4f0ee4afdebe545f
-rw-r--r--Android.bp1
-rw-r--r--libhwcomposer/drmfb.cpp2
-rw-r--r--libhwcomposer/format.cpp2
-rw-r--r--libhwcomposer/format.h2
-rw-r--r--libhwcomposer/img_gralloc1_public.h (renamed from libhwcomposer/hal_public.h)0
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