[Mesa-dev] [RFC][PATCH 2/5] Android.common.mk: define HAVE_TIMESPEC_GET

John Stultz john.stultz at linaro.org
Tue Jul 24 23:21:39 UTC 2018


From: Sumit Semwal <sumit.semwal at linaro.org>

This is a forward port of a patch from the AOSP/master tree:
https://android.googlesource.com/platform/external/mesa3d/+/bd30b663f55f8af73a0be4446349c5a2d4c641b0%5E%21/

Since https://android-review.googlesource.com/c/718518 added
timespec_get() to bionic, mesa3d doesn't build due to redefinition
of timespec_get().

Avoid redefinition by defining HAVE_TIMESPEC_GET flag.

Test: build and boot tested db820c to UI.

Cc: Rob Herring <rob.herring at linaro.org>
Cc: Alistair Strachan <astrachan at google.com>
Cc: Marissa Wall <marissaw at google.com>
Cc: Sumit Semwal <sumit.semwal at linaro.org>
Cc: Emil Velikov <emil.l.velikov at gmail.com>
Cc: Rob Clark <robdclark at gmail.com>
Signed-off-by: Sumit Semwal <sumit.semwal at linaro.org>
Signed-off-by: John Stultz <john.stultz at linaro.org>
---
 Android.common.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Android.common.mk b/Android.common.mk
index 397dc03..e7828af 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -89,6 +89,10 @@ LOCAL_CPPFLAGS += \
 LOCAL_CONLYFLAGS += \
 	-std=c99
 
+# c11 timespec_get is part of bionic as well
+# https://android-review.googlesource.com/c/718518
+LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET
+
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
-- 
2.7.4



More information about the mesa-dev mailing list