Commit: db36c0033e29d0bb98553f790c397f89dcd1d1e2 - external-gbm_gralloc (git)

external/gbm_gralloc

Commit MetaInfo

• Revisión: db36c0033e29d0bb98553f790c397f89dcd1d1e2 (tree)
• Tiempo: 2019-08-19 20:01:35
• Autor: Rob Herring <robh@kern...>
• Commiter: GitHub

Log Message

Merge pull request #12 from rsglobal/fixes-pr

Fixes

Cambiar Resumen

• modified: Android.mk
• modified: gralloc.cpp
• modified: gralloc_gbm.cpp

Diferencia incremental

--- a/Android.mk
+++ b/Android.mk
@@ -30,7 +30,8 @@ LOCAL_SHARED_LIBRARIES := \
 	libdrm \
 	libgbm \
 	liblog \
-	libcutils
+	libcutils \
+	libhardware \
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
 	$(LOCAL_PATH)

--- a/gralloc.cpp
+++ b/gralloc.cpp
@@ -24,7 +24,7 @@
 
 #define LOG_TAG "GRALLOC-GBM"
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
@@ -156,8 +156,7 @@ static int gbm_mod_close_gpu0(struct hw_device_t *dev)
 	struct alloc_device_t *alloc = (struct alloc_device_t *) dev;
 
 	gbm_dev_destroy(dmod->gbm);
-	native_handle_delete((native_handle*)handle);
-	//delete alloc;
+	delete alloc;
 
 	return 0;
 }

--- a/gralloc_gbm.cpp
+++ b/gralloc_gbm.cpp
@@ -24,11 +24,12 @@
 
 #define LOG_TAG "GRALLOC-GBM"
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/atomic.h>
 #include <cutils/properties.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>