commit cb39647a9b089f1205e813fefedcb3264c029946
author Lingfeng Yang <lfy@google.com> Mon May 06 12:22:12 2019 -0700
committer Lingfeng Yang <lfy@google.com> Mon May 06 21:21:22 2019 +0000
tree 731410b8bcfb3350f53c3c89f75b3dff08c26fb5
parent 0aadd26e08a82f2ca46722978a4f165bbef3ee9a

Fix build on older API levels

Some gralloc0 entry points not defined for older API levels

Bug: 131089111

Change-Id: If89b79af5e96dfcea6025ed247b75fea51284831

gralloc/Android.mk

diff --git a/gralloc/Android.mk b/gralloc/Android.mk
index a837f0a..8576e91 100644
--- a/gralloc/Android.mk
+++ b/gralloc/Android.mk
@@ -32,6 +32,7 @@
 
 LOCAL_MODULE := gralloc.goldfish.default
 LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -Wno-missing-field-initializers
+LOCAL_CFLAGS:= -DPLATFORM_VERSION=$(PLATFORM_VERSION)
 ifeq ($(TARGET_USE_PAN_DISPLAY),true)
 LOCAL_CFLAGS += -DUSE_PAN_DISPLAY=1
 endif

gralloc/gralloc.cpp

diff --git a/gralloc/gralloc.cpp b/gralloc/gralloc.cpp
index 791d90f..97e6857 100644
--- a/gralloc/gralloc.cpp
+++ b/gralloc/gralloc.cpp
@@ -89,8 +89,10 @@
         .unregisterBuffer = gralloc_unregister_buffer,
         .lock = gralloc_lock,
         .unlock = gralloc_unlock,
+#if PLATFORM_VERSION > 9
         .validateBufferSize = NULL,
         .getTransportSize = NULL,
+#endif
     },
     .framebuffer = 0,
     .flags = 0,