i965: fix Android build

Use $(TARGET_CC) instead of $(CC).  Correctly name and set LOCAL_CFLAGS.

Reviewed-by: Chad Versace <chad@chad-versace.us>

diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index b8ccd0c1b217e3b8f5668c6797bf9ed7b312f868..67f656b78a07e189b5444521054de36300c0016e 100644 (file)
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -31,6 +31,11 @@ include $(LOCAL_PATH)/common/Makefile.sources
 MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/dri
 MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/dri
 
+MESA_DRI_CFLAGS := \
+       -DFEATURE_GL=1 \
+       -DFEATURE_ES1=1 \
+       -DFEATURE_ES2=1
+
 MESA_DRI_C_INCLUDES := \
        $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
        $(DRM_TOP) \

diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 2a289ddcd96d7bb826c8b13463840514d59eedc6..3f49c8b17618a2dac1a2ab6132aeea6b8440a16f 100644 (file)
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -34,11 +34,10 @@ include $(LOCAL_PATH)/Makefile.sources
 
 # Overriding LOCAL_CC below is an ugly workaround.  We cannot place -std=c99
 # in LOCAL_C_FLAGS because Android appends LOCAL_C_FLAGS to LOCAL_CPP_FLAGS.
-LOCAL_CC := $(CC) -std=c99
+LOCAL_CC := $(TARGET_CC) -std=c99
 
-LOCAL_C_FLAGS := \
-       $(MESA_DRI_C_FLAGS) \
-       -DI965
+LOCAL_CFLAGS := \
+       $(MESA_DRI_CFLAGS)
 
 LOCAL_C_INCLUDES := \
        $(i965_INCLUDES) \