android: define HAVE_ANDROID_PLATFORM in android build (v3)

Fixes the correct build of android paths for any future case,
by moving definition to top Android.common.mk

(v2) definition in src/egl/Android.mk is removed

(v3) changes due to a0f6a11944 ("egl: drop unused _EGL_BUILT_IN_DRIVER_DRI2")

Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>

diff --git a/Android.common.mk b/Android.common.mk
index e0d2df0..1e489c4 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -39,7 +39,8 @@ LOCAL_CFLAGS += \
        -Wno-mismatched-tags \
        -DVERSION=\"$(MESA_VERSION)\" \
        -DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
-       -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"
+       -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\" \
+       -DHAVE_ANDROID_PLATFORM
 
 # XXX: The following __STDC_*_MACROS defines should not be needed.
 # It's likely due to a bug elsewhere, but let's temporarily add them

diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index 42b391e..fd87374 100644 (file)
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -39,8 +39,7 @@ LOCAL_SRC_FILES := \
        drivers/dri2/platform_android.c
 
 LOCAL_CFLAGS := \
-       -D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_ANDROID \
-       -DHAVE_ANDROID_PLATFORM
+       -D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_ANDROID
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/include/drm-uapi \