summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-I Wu <olvaffe@gmail.com>2011-08-03 13:28:02 +0900
committerChia-I Wu <olvaffe@gmail.com>2011-08-03 13:33:15 +0900
commit4023c793720aa29b3301d48b7f6f1369fbc58c0a (patch)
treeb1ecff547882ada78f10e89795f738bee2aa0489
parent0e4dfb92fc2147b46afcdf7cb72a52a23e72d4eb (diff)
android: drop the 'c' suffix of classic drivers
As Chad Versace suggests, they are not how the developers call them.
-rw-r--r--Android.mk8
-rw-r--r--src/mesa/drivers/Android.mk8
2 files changed, 8 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk
index 9cb2e67080..13cae72469 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,7 @@
# BOARD_GPU_DRIVERS should be defined. The valid values are
#
-# classic drivers: i915c, i965c
+# classic drivers: i915, i965
# gallium drivers: i915g, r300g, r600g, nouveau, vmwgfx
#
# The main target is libGLES_mesa. Classic drivers depend on
@@ -69,10 +69,10 @@ MESA_GPU_DRIVERS := $(BOARD_GPU_DRIVERS)
# convert board uses to MESA_GPU_DRIVERS
ifeq ($(strip $(MESA_GPU_DRIVERS)),)
ifeq ($(strip $(BOARD_USES_I915C)),true)
-MESA_GPU_DRIVERS += i915c
+MESA_GPU_DRIVERS += i915
endif
ifeq ($(strip $(BOARD_USES_I965C)),true)
-MESA_GPU_DRIVERS += i965c
+MESA_GPU_DRIVERS += i965
endif
ifeq ($(strip $(BOARD_USES_I915G)),true)
MESA_GPU_DRIVERS += i915g
@@ -91,7 +91,7 @@ MESA_GPU_DRIVERS += vmwgfx
endif
endif # MESA_GPU_DRIVERS
-classic_drivers := i915c i965c
+classic_drivers := i915 i965
gallium_drivers := i915g r300g r600g nouveau vmwgfx
# warn about invalid drivers
diff --git a/src/mesa/drivers/Android.mk b/src/mesa/drivers/Android.mk
index 6bc107f3d6..a5c3b869d5 100644
--- a/src/mesa/drivers/Android.mk
+++ b/src/mesa/drivers/Android.mk
@@ -232,7 +232,7 @@ common_SHARED_LIBRARIES := \
common_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/dri
-ifneq ($(filter i915c, $(MESA_GPU_DRIVERS)),)
+ifneq ($(filter i915, $(MESA_GPU_DRIVERS)),)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
@@ -260,9 +260,9 @@ LOCAL_MODULE_PATH := $(common_MODULE_PATH)
include $(MESA_COMMON_MK)
include $(BUILD_SHARED_LIBRARY)
-endif # i915c
+endif # i915
-ifneq ($(filter i965c, $(MESA_GPU_DRIVERS)),)
+ifneq ($(filter i965, $(MESA_GPU_DRIVERS)),)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
@@ -290,4 +290,4 @@ LOCAL_MODULE_PATH := $(common_MODULE_PATH)
include $(MESA_COMMON_MK)
include $(BUILD_SHARED_LIBRARY)
-endif # i965c
+endif # i965