summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/Android.mk5
-rw-r--r--src/mesa/drivers/dri/i965/Android.mk7
2 files changed, 8 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index b8ccd0c1b21..67f656b78a0 100644
--- 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 2a289ddcd96..3f49c8b1761 100644
--- 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) \