commit b2f4f09387df900cdbbf4519265ad17207f6caad
author JohnnLee <johnnlee@google.com> Tue Jun 08 14:15:57 2021 +0800
committer Johnny Lee <johnnlee@google.com> Wed Jun 23 03:08:54 2021 +0000
tree 7ce4692deb9ab85a4ac664740f5e72792cf83f86
parent b5e243f592f496d995fa8c9ac9d24759019b53ee

Move GrallocProperties for build breakage

Bug: 188781413
Change-Id: Id557e9e940613ec609fe0eb6ac9010b8b553c94b

gralloc/gr_adreno_info.h

diff --git a/gralloc/gr_adreno_info.h b/gralloc/gr_adreno_info.h
index 527adde..357b25a 100644
--- a/gralloc/gr_adreno_info.h
+++ b/gralloc/gr_adreno_info.h
@@ -32,8 +32,6 @@
 
 #include <media/msm_media_info.h>
 
-#include "gr_utils.h"
-
 namespace gralloc {
 
 // Adreno Pixel Formats
@@ -115,6 +113,12 @@
   SURFACE_TILE_MODE_ENABLE     = 0x1     // used for tiled surface
 } surface_tile_mode_t;
 
+struct GrallocProperties {
+  bool use_system_heap_for_sensors = true;
+  bool ubwc_disable = false;
+  bool ahardware_buffer_disable = false;
+};
+
 class AdrenoMemInfo {
  public:
   /*

gralloc/gr_allocator.h

diff --git a/gralloc/gr_allocator.h b/gralloc/gr_allocator.h
index 8a9ba64..e3ebdec 100644
--- a/gralloc/gr_allocator.h
+++ b/gralloc/gr_allocator.h
@@ -34,6 +34,7 @@
 
 #include "gr_buf_descriptor.h"
 #include "gr_ion_alloc.h"
+#include "gr_adreno_info.h"
 #include "gr_utils.h"
 #include "gralloc_priv.h"
 

gralloc/gr_buf_mgr.h

diff --git a/gralloc/gr_buf_mgr.h b/gralloc/gr_buf_mgr.h
index a3a8c43..a0037f9 100644
--- a/gralloc/gr_buf_mgr.h
+++ b/gralloc/gr_buf_mgr.h
@@ -30,6 +30,7 @@
 
 #include "gr_allocator.h"
 #include "gr_buf_descriptor.h"
+#include "gr_adreno_info.h"
 #include "gr_utils.h"
 #include "gralloc_priv.h"
 

gralloc/gr_utils.h

diff --git a/gralloc/gr_utils.h b/gralloc/gr_utils.h
index e21f92b..6eb6c79 100644
--- a/gralloc/gr_utils.h
+++ b/gralloc/gr_utils.h
@@ -63,12 +63,6 @@
   uint64_t usage;
 };
 
-struct GrallocProperties {
-  bool use_system_heap_for_sensors = true;
-  bool ubwc_disable = false;
-  bool ahardware_buffer_disable = false;
-};
-
 template <class Type1, class Type2>
 inline Type1 ALIGN(Type1 x, Type2 align) {
   return (Type1)((x + (Type1)align - 1) & ~((Type1)align - 1));