• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得cocoapythonrubywindowsphpgameguibathyscaphec翻訳omegatframework計画中(planning stage)twitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

external/gbm_gralloc


Commit MetaInfo

Revisiondb36c0033e29d0bb98553f790c397f89dcd1d1e2 (tree)
Time2019-08-19 20:01:35
AuthorRob Herring <robh@kern...>
CommiterGitHub

Log Message

Merge pull request #12 from rsglobal/fixes-pr

Fixes

Change Summary

Incremental Difference

--- a/Android.mk
+++ b/Android.mk
@@ -30,7 +30,8 @@ LOCAL_SHARED_LIBRARIES := \
3030 libdrm \
3131 libgbm \
3232 liblog \
33- libcutils
33+ libcutils \
34+ libhardware \
3435
3536 LOCAL_EXPORT_C_INCLUDE_DIRS := \
3637 $(LOCAL_PATH)
--- a/gralloc.cpp
+++ b/gralloc.cpp
@@ -24,7 +24,7 @@
2424
2525 #define LOG_TAG "GRALLOC-GBM"
2626
27-#include <cutils/log.h>
27+#include <log/log.h>
2828 #include <stdlib.h>
2929 #include <stdarg.h>
3030 #include <string.h>
@@ -156,8 +156,7 @@ static int gbm_mod_close_gpu0(struct hw_device_t *dev)
156156 struct alloc_device_t *alloc = (struct alloc_device_t *) dev;
157157
158158 gbm_dev_destroy(dmod->gbm);
159- native_handle_delete((native_handle*)handle);
160- //delete alloc;
159+ delete alloc;
161160
162161 return 0;
163162 }
--- a/gralloc_gbm.cpp
+++ b/gralloc_gbm.cpp
@@ -24,11 +24,12 @@
2424
2525 #define LOG_TAG "GRALLOC-GBM"
2626
27-#include <cutils/log.h>
27+#include <log/log.h>
2828 #include <cutils/atomic.h>
2929 #include <cutils/properties.h>
3030 #include <stdlib.h>
3131 #include <string.h>
32+#include <unistd.h>
3233 #include <errno.h>
3334 #include <sys/types.h>
3435 #include <sys/stat.h>