diff options
| author | Lingfeng Yang <lfy@google.com> | 2019-05-06 12:21:42 -0700 |
|---|---|---|
| committer | Lingfeng Yang <lfy@google.com> | 2019-05-06 21:21:31 +0000 |
| commit | d4fa2de8bde26f16d17ae130d24d6c4da718f510 (patch) | |
| tree | 1f8e18241c2b542e1efc322c043e9c30272ba7ac | |
| parent | c17779dc05779683455437c0497beebca23bed00 (diff) | |
| download | device_generic_goldfish-opengl-d4fa2de8bde26f16d17ae130d24d6c4da718f510.tar.gz device_generic_goldfish-opengl-d4fa2de8bde26f16d17ae130d24d6c4da718f510.tar.bz2 device_generic_goldfish-opengl-d4fa2de8bde26f16d17ae130d24d6c4da718f510.zip | |
Fix build on older apis
some gralloc0 entry points not defined for older api levels
bug: Bug: 131089111
Change-Id: If3f1843ffb2c008052a5dec87b9063d2500298f1
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | system/gralloc/gralloc.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -73,6 +73,7 @@ ifeq (true,$(BUILD_EMULATOR_OPENGL)) # Guest build GOLDFISH_OPENGL_SHOULD_BUILD := true EMUGL_COMMON_CFLAGS += -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION) +EMUGL_COMMON_CFLAGS += -DPLATFORM_VERSION=$(PLATFORM_VERSION) ifeq (O, $(PLATFORM_VERSION_CODENAME)) EMUGL_COMMON_CFLAGS += -DGOLDFISH_HIDL_GRALLOC diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp index d3c16751..fa30e501 100644 --- a/system/gralloc/gralloc.cpp +++ b/system/gralloc/gralloc.cpp @@ -1542,8 +1542,10 @@ struct private_module_t HAL_MODULE_INFO_SYM = { lock: gralloc_lock, unlock: gralloc_unlock, perform: NULL, +#if PLATFORM_VERSION > 9 // In Q, we want to specify these, but SDK version is not 29 yet. validateBufferSize: NULL, getTransportSize: NULL, +#endif // PLATFORM_VERSION > 9 #if PLATFORM_SDK_VERSION >= 18 lock_ycbcr: gralloc_lock_ycbcr, #endif // PLATFORM_SDK_VERSION >= 18 |