From: Sumit Semwal <[email protected]> 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 <[email protected]> Cc: Alistair Strachan <[email protected]> Cc: Marissa Wall <[email protected]> Cc: Sumit Semwal <[email protected]> Cc: Emil Velikov <[email protected]> Cc: Rob Clark <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Signed-off-by: Sumit Semwal <[email protected]> Signed-off-by: John Stultz <[email protected]> --- v2: Conditionalize it for PLATFORM_VERSION Q and higher --- Android.common.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Android.common.mk b/Android.common.mk index 397dc03..3585470 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -89,6 +89,12 @@ LOCAL_CPPFLAGS += \ LOCAL_CONLYFLAGS += \ -std=c99 +# c11 timespec_get is part of bionic as well +# https://android-review.googlesource.com/c/718518 +ifneq ($(shell [ "$(MESA_ANDROID_MAJOR_VERSION)" \< "Q" ]; echo $$?),0) +LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET +endif + ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += \ -- 2.7.4 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
