commit 766518e046494bd7207f709f2e2b0ab7734d7ce9
author Zach Reizner <zachr@google.com> Thu Oct 22 16:34:49 2015 -0700
committer Zach Reizner <zachr@google.com> Thu Oct 22 16:39:52 2015 -0700
tree 2ee2012bef4ed3835dd90da81e75227a64db2b3c
parent 6f82f1d69d1194ee43dd9f36c0314afb6634cbbb

drm_hwcomposer: use latest patchset of "separate C compliant header file."

Revert "drm_hwcomposer: separate C compliant header file."

This reverts commit e7eff73fb428d53c5488ef470d9e401949eb1b00.

drm_hwcomposer: separate C compliant header file.

Creating C compliant header file drmhwcgralloc.h.
gralloc.tegra uses C compiler and depends only on code in drmhwcgralloc.h.
The module doesn't depend on anything present in new drm_hwcomposer.h.
This is required to fix the compile error.

Change-Id: If7188a20a7c4ef90eb7598f0cb7733b3a45ace51

drm_hwcomposer.h

diff --git a/drm_hwcomposer.h b/drm_hwcomposer.h
index 3d32681..5a45782 100644
--- a/drm_hwcomposer.h
+++ b/drm_hwcomposer.h
@@ -23,7 +23,17 @@
 #include <hardware/hardware.h>
 #include <hardware/hwcomposer.h>
 #include "seperate_rects.h"
-#include "drm_hwc.h"
+#include "drmhwcgralloc.h"
+
+struct hwc_import_context;
+
+int hwc_import_init(struct hwc_import_context **ctx);
+int hwc_import_destroy(struct hwc_import_context *ctx);
+
+int hwc_import_bo_create(int fd, struct hwc_import_context *ctx,
+                         buffer_handle_t buf, struct hwc_drm_bo *bo);
+bool hwc_import_bo_release(int fd, struct hwc_import_context *ctx,
+                           struct hwc_drm_bo *bo);
 
 namespace android {
 

drmhwcgralloc.h

diff --git a/drm_hwc.h b/drmhwcgralloc.h
similarity index 73%
rename from drm_hwc.h
rename to drmhwcgralloc.h
index fb2de7c..43b36f9 100644
--- a/drm_hwc.h
+++ b/drmhwcgralloc.h
@@ -14,17 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_DRM_HWC_H_
-#define ANDROID_DRM_HWC_H_
+#ifndef ANDROID_DRMHWCGRALLOC_H_
+#define ANDROID_DRMHWCGRALLOC_H_
 
-#include <stdbool.h>
 #include <stdint.h>
 
-#include <hardware/hardware.h>
-#include <hardware/hwcomposer.h>
-
-struct hwc_import_context;
-
 enum {
   /* perform(const struct gralloc_module_t *mod,
    *	   int op,
@@ -63,12 +57,4 @@
   void *priv;
 } hwc_drm_bo_t;
 
-int hwc_import_init(struct hwc_import_context **ctx);
-int hwc_import_destroy(struct hwc_import_context *ctx);
-
-int hwc_import_bo_create(int fd, struct hwc_import_context *ctx,
-                         buffer_handle_t buf, struct hwc_drm_bo *bo);
-bool hwc_import_bo_release(int fd, struct hwc_import_context *ctx,
-                           struct hwc_drm_bo *bo);
-
-#endif // ANDROID_DRM_HWC_H_
+#endif // ANDROID_DRMHWCGRALLOC_H_