android: pass -std=c99 by default

Several modules expect a C99 compiler already.  It is also the default for
Makefile build.

diff --git a/Android.common.mk b/Android.common.mk
index f28ddc2ef66dd9eb048af7ee491c37d3ba57dcb7..e8b900697f3e8d7a233c4e68fe790f55bd877b96 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -21,6 +21,15 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+# use c99 compiler by default
+ifeq ($(LOCAL_CC),)
+ifeq ($(LOCAL_IS_HOST_MODULE),true)
+LOCAL_CC := $(HOST_CC) -std=c99
+else
+LOCAL_CC := $(TARGET_CC) -std=c99
+endif
+endif
+
 LOCAL_C_INCLUDES += \
        $(MESA_TOP)/include
 

diff --git a/src/gallium/drivers/i915/Android.mk b/src/gallium/drivers/i915/Android.mk
index 780ace5c530c0d446fb2da1b2c749face4d4f4e9..fece3053e375587fd57fc65c3c45a347eb7b5374 100644 (file)
--- a/src/gallium/drivers/i915/Android.mk
+++ b/src/gallium/drivers/i915/Android.mk
@@ -30,8 +30,6 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
 
-LOCAL_CFLAGS := -std=c99
-
 LOCAL_MODULE := libmesa_pipe_i915
 
 include $(GALLIUM_COMMON_MK)

diff --git a/src/gallium/drivers/nvfx/Android.mk b/src/gallium/drivers/nvfx/Android.mk
index 6dee1116f9b7bc004bb27314987519ee5007dc59..219b044d448e01e5b7ed492565ff1d8f39334f8e 100644 (file)
--- a/src/gallium/drivers/nvfx/Android.mk
+++ b/src/gallium/drivers/nvfx/Android.mk
@@ -29,7 +29,6 @@ include $(LOCAL_PATH)/Makefile.sources
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
-LOCAL_CFLAGS := -std=c99
 LOCAL_C_INCLUDES := $(DRM_TOP)
 
 LOCAL_MODULE := libmesa_pipe_nvfx

diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk
index fe3c2bd2611b9f435778934a4828bd9a89a993a6..ff27ef6b24daa7a9a4cba1b879454f6ceea6130c 100644 (file)
--- a/src/gallium/drivers/r300/Android.mk
+++ b/src/gallium/drivers/r300/Android.mk
@@ -30,8 +30,6 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
 
-LOCAL_CFLAGS := -std=c99
-
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/glsl \

diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk
index f060920d5d7156c60b9518c5fb1903440e15f03e..e5188bb628e2166740b07f2a12b3417c6e7a073c 100644 (file)
--- a/src/gallium/drivers/r600/Android.mk
+++ b/src/gallium/drivers/r600/Android.mk
@@ -30,8 +30,6 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
 
-LOCAL_CFLAGS := -std=c99
-
 LOCAL_C_INCLUDES :=
 
 LOCAL_MODULE := libmesa_pipe_r600

diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index f21ba3aa0d6c0ca09209fb13ebc91d25900cf5f5..f6c0f4e33d2394879cb4024222b845d03799df0a 100644 (file)
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
@@ -56,6 +56,7 @@ LOCAL_SRC_FILES := x86/gen_matypes.c
 LOCAL_CFLAGS := $(common_CFLAGS)
 LOCAL_C_INCLUDES := $(common_C_INCLUDES)
 LOCAL_MODULE := mesa_gen_matypes
+LOCAL_IS_HOST_MODULE := true
 include $(MESA_COMMON_MK)
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -145,6 +146,7 @@ LOCAL_SRC_FILES := \
        program/symbol_table.c
 
 LOCAL_MODULE := libmesa_glsl_utils
+LOCAL_IS_HOST_MODULE := true
 
 include $(MESA_COMMON_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk
index 21b3450b84faaf333f5a51d7a380244034681296..b615e9b753da021744bb659a8803a4317bc8e25b 100644 (file)
--- a/src/mesa/drivers/dri/i915/Android.mk
+++ b/src/mesa/drivers/dri/i915/Android.mk
@@ -32,10 +32,6 @@ LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH)
 # Import variables i915_*.
 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 := $(TARGET_CC) -std=c99
-
 LOCAL_CFLAGS := \
        $(MESA_DRI_CFLAGS) \
        -DI915

diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 3f49c8b17618a2dac1a2ab6132aeea6b8440a16f..ec4a76130990a6dea8435277490a2e0154452b3e 100644 (file)
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -32,10 +32,6 @@ LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH)
 # Import variables i965_*.
 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 := $(TARGET_CC) -std=c99
-
 LOCAL_CFLAGS := \
        $(MESA_DRI_CFLAGS)