diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2018-08-01 16:20:37 -0700 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-08-02 15:42:27 -0600 |
| commit | d0b63b6583779305dfc55a97a6f18acf183d3871 (patch) | |
| tree | 68aa740ae8bfa6377d4780058a2be46ca473a63c /Android.common.mk | |
| parent | dc030d1ec961e8fea961ece5aadc59c23be5bf2a (diff) | |
Android.common.mk: define HAVE_TIMESPEC_GET
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.
Change-Id: I3dcc8034b48785e45cd3fa50e4d9cf2c684694a0
Cc: Rob Herring <rob.herring@linaro.org>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Marissa Wall <marissaw@google.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'Android.common.mk')
| -rw-r--r-- | Android.common.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Android.common.mk b/Android.common.mk index 397dc03dee4..619b216b63b 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -89,6 +89,13 @@ LOCAL_CPPFLAGS += \ LOCAL_CONLYFLAGS += \ -std=c99 +# c11 timespec_get is part of bionic as well +# https://android-review.googlesource.com/c/718518 +# This means releases from P and earlier won't need this +ifeq ($(filter 5 6 7 8 9, $(MESA_ANDROID_MAJOR_VERSION)),) +LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET +endif + ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += \ |