diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-05-12 18:15:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-12 18:15:10 +0000 |
| commit | 8aa06ff6ba9a3d67c548450ca788fc66975cc3ff (patch) | |
| tree | 7efe0767edd79fc04fedac5fca0384e644fec5d4 | |
| parent | 1f0b206699db8d6fd74be5d8ef3f05a53883a52a (diff) | |
| parent | 0e00cd058fe59b90068fa0888000fec5a99dae30 (diff) | |
| download | android_device_generic_goldfish-8aa06ff6ba9a3d67c548450ca788fc66975cc3ff.tar.gz android_device_generic_goldfish-8aa06ff6ba9a3d67c548450ca788fc66975cc3ff.tar.bz2 android_device_generic_goldfish-8aa06ff6ba9a3d67c548450ca788fc66975cc3ff.zip | |
am 0e00cd05: am dbda557d: am 5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"
* commit '0e00cd058fe59b90068fa0888000fec5a99dae30':
gralloc: don't initialize reserved_proc
| -rw-r--r-- | opengl/system/gralloc/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/system/gralloc/gralloc.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/opengl/system/gralloc/Android.mk b/opengl/system/gralloc/Android.mk index 8705602..71ac2f2 100644 --- a/opengl/system/gralloc/Android.mk +++ b/opengl/system/gralloc/Android.mk @@ -7,6 +7,7 @@ $(call emugl-import,libGLESv1_enc lib_renderControl_enc libOpenglSystemCommon) $(call emugl-set-shared-library-subpath,hw) LOCAL_CFLAGS += -DLOG_TAG=\"gralloc_goldfish\" +LOCAL_CFLAGS += -Wno-missing-field-initializers LOCAL_SRC_FILES := gralloc.cpp diff --git a/opengl/system/gralloc/gralloc.cpp b/opengl/system/gralloc/gralloc.cpp index f6f448c..442bbcc 100644 --- a/opengl/system/gralloc/gralloc.cpp +++ b/opengl/system/gralloc/gralloc.cpp @@ -1007,7 +1007,6 @@ struct private_module_t HAL_MODULE_INFO_SYM = { unlock: gralloc_unlock, perform: NULL, lock_ycbcr: gralloc_lock_ycbcr, - reserved_proc: {0, } } }; |