diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-08 03:06:00 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-08 03:06:00 +0000 |
| commit | 99399b2cc87853e7c9af5e3c6658e41fc4913288 (patch) | |
| tree | 08986b95f0bcbca17a9fdf7b03da6cbf014d5867 | |
| parent | 30e7c574857af1b2382657269a29ceb31a0cddde (diff) | |
| parent | 09627c8a55cc3e18b538fc3f47e5b58bf6b8454d (diff) | |
| download | device_generic_goldfish-opengl-99399b2cc87853e7c9af5e3c6658e41fc4913288.tar.gz device_generic_goldfish-opengl-99399b2cc87853e7c9af5e3c6658e41fc4913288.tar.bz2 device_generic_goldfish-opengl-99399b2cc87853e7c9af5e3c6658e41fc4913288.zip | |
Snap for 5540187 from 09627c8a55cc3e18b538fc3f47e5b58bf6b8454d to qt-release
Change-Id: I322ea0e4e3c35deee4c0cbeab597ba623b65bff2
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | system/gralloc/gralloc.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
@@ -73,7 +73,6 @@ 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 fa30e501..d76ac0b9 100644 --- a/system/gralloc/gralloc.cpp +++ b/system/gralloc/gralloc.cpp @@ -1542,10 +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. +#if PLATFORM_SDK_VERSION >= 28 // In Q, we want to specify these, but SDK version is not 29 yet. do not merge this to P validateBufferSize: NULL, getTransportSize: NULL, -#endif // PLATFORM_VERSION > 9 +#endif // PLATFORM_VERSION > 28 #if PLATFORM_SDK_VERSION >= 18 lock_ycbcr: gralloc_lock_ycbcr, #endif // PLATFORM_SDK_VERSION >= 18 |