summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/Android.mk
diff options
context:
space:
mode:
authorPFO <pfolinux@rdi-linux>2011-06-17 16:07:53 +0200
committerHugues Hiegel <hugues@hiegel.fr>2011-06-17 16:24:44 +0200
commit06543d0bbd13f804a6c49f4978a65288211eeebc (patch)
treee5e60ecae0d95370e788fedea6690910134e436f /src/mesa/drivers/Android.mk
parentd58e3fa353c5df8028413837a366a16ff6054015 (diff)
parent5607823fe4ff35e11086efa6302d8fbacd315b06 (diff)
Merge cleanups for deliveryHEADr300
Diffstat (limited to 'src/mesa/drivers/Android.mk')
-rw-r--r--src/mesa/drivers/Android.mk33
1 files changed, 31 insertions, 2 deletions
diff --git a/src/mesa/drivers/Android.mk b/src/mesa/drivers/Android.mk
index afa6ced8b8..4555dc1a27 100644
--- a/src/mesa/drivers/Android.mk
+++ b/src/mesa/drivers/Android.mk
@@ -297,7 +297,36 @@ LOCAL_MODULE_PATH := $(common_MODULE_PATH)
include $(BUILD_SHARED_LIBRARY)
endif # MESA_BUILD_I915C
-ifeq ($(strip $(MESA_BUILD_R600G)),true)
+ifeq ($(strip $(MESA_BUILD_I965C)),true)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ $(common_SOURCES) \
+ $(i965_DRIVER_SOURCES)
+
+LOCAL_CFLAGS := \
+ $(common_CFLAGS) \
+ -DI965
+
+LOCAL_C_INCLUDES := \
+ $(common_C_INCLUDES) \
+ external/mesa/src/mesa/drivers/dri/intel \
+ external/drm/intel
+
+LOCAL_STATIC_LIBRARIES := \
+ $(common_STATIC_LIBRARIES)
+
+LOCAL_SHARED_LIBRARIES := \
+ $(common_SHARED_LIBRARIES) \
+ libdrm_intel
+
+LOCAL_MODULE := i965_dri
+LOCAL_MODULE_PATH := $(common_MODULE_PATH)
+
+include $(BUILD_SHARED_LIBRARY)
+endif # MESA_BUILD_I965C
+
+ifeq ($(strip $(MESA_BUILD_R300)),true)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
@@ -328,5 +357,5 @@ LOCAL_MODULE := libr300_dri
include $(BUILD_STATIC_LIBRARY)
-endif # MESA_BUILD_R600G
+endif # MESA_BUILD_R300