From d4fa2de8bde26f16d17ae130d24d6c4da718f510 Mon Sep 17 00:00:00 2001
From: Lingfeng Yang <lfy@google.com>
Date: Mon, 6 May 2019 12:21:42 -0700
Subject: [PATCH] Fix build on older apis
some gralloc0 entry points not defined for older api levels
bug: Bug: 131089111
Change-Id: If3f1843ffb2c008052a5dec87b9063d2500298f1
---
Android.mk | 1 +
system/gralloc/gralloc.cpp | 2 ++
2 files changed, 3 insertions(+)
diff --git a/Android.mk b/Android.mk
index 6cf4651..ce7c599 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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 d3c1675..fa30e50 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
--
GitLab