OSDN Git Service
(root)
/
android-x86
/
hardware-libhardware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e1f89b
)
Fix the simulator build.
author
Marco Nelissen
<marcone@google.com>
Fri, 17 Jul 2009 18:14:53 +0000
(11:14 -0700)
committer
Marco Nelissen
<marcone@google.com>
Fri, 17 Jul 2009 18:15:18 +0000
(11:15 -0700)
modules/gralloc/gralloc.cpp
patch
|
blob
|
history
diff --git
a/modules/gralloc/gralloc.cpp
b/modules/gralloc/gralloc.cpp
index
9928a75
..
4eb9317
100644
(file)
--- a/
modules/gralloc/gralloc.cpp
+++ b/
modules/gralloc/gralloc.cpp
@@
-179,6
+179,7
@@
static int gralloc_alloc_framebuffer(alloc_device_t* dev,
static int init_pmem_area_locked(private_module_t* m)
{
int err = 0;
+#if HAVE_ANDROID_OS // should probably define HAVE_PMEM somewhere
int master_fd = open("/dev/pmem", O_RDWR, 0);
if (master_fd >= 0) {
@@
-206,6
+207,9
@@
static int init_pmem_area_locked(private_module_t* m)
err = -errno;
}
return err;
+#else
+ return -1;
+#endif
}
static int init_pmem_area(private_module_t* m)