summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-05-08 03:11:06 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-05-08 03:11:06 +0000
commitc06f2d3c26c60ea124c788829907ee59858b89e4 (patch)
tree4a59882cd08a454474aaa43f816e6f37cf686c6d
parent00f9e099d4b00e75f366a2433d54903171a59291 (diff)
parent0d52ede1491b2eda07e6bb4c0dce61ac013dc5f7 (diff)
downloadandroid_device_generic_goldfish-c06f2d3c26c60ea124c788829907ee59858b89e4.tar.gz
android_device_generic_goldfish-c06f2d3c26c60ea124c788829907ee59858b89e4.tar.bz2
android_device_generic_goldfish-c06f2d3c26c60ea124c788829907ee59858b89e4.zip
Snap for 5540187 from 0d52ede1491b2eda07e6bb4c0dce61ac013dc5f7 to qt-release
Change-Id: If621cd778baca630366423abd0a1e6b68279654f
-rw-r--r--gralloc/Android.mk2
-rw-r--r--gralloc/gralloc.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/gralloc/Android.mk b/gralloc/Android.mk
index 8576e91..e0b0b85 100644
--- a/gralloc/Android.mk
+++ b/gralloc/Android.mk
@@ -32,7 +32,7 @@ LOCAL_HEADER_LIBRARIES := libhardware_headers
LOCAL_MODULE := gralloc.goldfish.default
LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -Wno-missing-field-initializers
-LOCAL_CFLAGS:= -DPLATFORM_VERSION=$(PLATFORM_VERSION)
+LOCAL_CFLAGS:= -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
ifeq ($(TARGET_USE_PAN_DISPLAY),true)
LOCAL_CFLAGS += -DUSE_PAN_DISPLAY=1
endif
diff --git a/gralloc/gralloc.cpp b/gralloc/gralloc.cpp
index 97e6857..3f2c025 100644
--- a/gralloc/gralloc.cpp
+++ b/gralloc/gralloc.cpp
@@ -89,7 +89,7 @@ struct private_module_t HAL_MODULE_INFO_SYM = {
.unregisterBuffer = gralloc_unregister_buffer,
.lock = gralloc_lock,
.unlock = gralloc_unlock,
-#if PLATFORM_VERSION > 9
+#if PLATFORM_SDK_VERSION >= 28
.validateBufferSize = NULL,
.getTransportSize = NULL,
#endif