Snap for 6157194 from d130979e7594c4471ed89c93b6e0b86579ae79a3 to r-keystone-qcom-release
Change-Id: I15d35b40c6f9563240a64925c2d9fbdff39f59a9
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
similarity index 100%
rename from libhwcomposer/hal_public.h
rename to libhwcomposer/img_gralloc1_public.h