mirror of
				https://github.com/tiagovignatti/intel-gpu-tools.git
				synced 2025-11-04 12:07:12 +00:00 
			
		
		
		
	Android.mk: replace std=c99 with std=gnu99
The android makefiles were passing the -std=c99 flag to the compiler which disables the typeof keyword. This causes a build fail for a recent addition to igt_aux.h. Change this to -std=gnu99, which is the flag used in the linux build Signed-off-by: Tim Gore <tim.gore@intel.com> Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
		
							parent
							
								
									264e1ac10a
								
							
						
					
					
						commit
						a11117e42f
					
				@ -11,7 +11,7 @@ define add_benchmark
 | 
			
		||||
 | 
			
		||||
    LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
 | 
			
		||||
    LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h"
 | 
			
		||||
    LOCAL_CFLAGS += -std=c99
 | 
			
		||||
    LOCAL_CFLAGS += -std=gnu99
 | 
			
		||||
    # FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit
 | 
			
		||||
    LOCAL_CFLAGS += -Wno-error=return-type
 | 
			
		||||
    # Excessive complaining for established cases. Rely on the Linux version warnings.
 | 
			
		||||
 | 
			
		||||
@ -10,7 +10,7 @@ include $(CLEAR_VARS)
 | 
			
		||||
 | 
			
		||||
LOCAL_CFLAGS += -DHAVE_TERMIOS_H
 | 
			
		||||
LOCAL_CFLAGS += -DANDROID -UNDEBUG
 | 
			
		||||
LOCAL_CFLAGS += -std=c99
 | 
			
		||||
LOCAL_CFLAGS += -std=gnu99
 | 
			
		||||
# Excessive complaining for established cases. Rely on the Linux version warnings.
 | 
			
		||||
LOCAL_CFLAGS += -Wno-sign-compare
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -25,7 +25,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 | 
			
		||||
LOCAL_CFLAGS += -DHAVE_LIBDRM_ATOMIC_PRIMITIVES
 | 
			
		||||
LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
 | 
			
		||||
LOCAL_CFLAGS += -DANDROID
 | 
			
		||||
LOCAL_CFLAGS += -std=c99
 | 
			
		||||
LOCAL_CFLAGS += -std=gnu99
 | 
			
		||||
LOCAL_MODULE:= libintel_gpu_tools
 | 
			
		||||
 | 
			
		||||
LOCAL_SHARED_LIBRARIES := libpciaccess  \
 | 
			
		||||
 | 
			
		||||
@ -33,7 +33,7 @@ skip_tests_list += pm_rpm
 | 
			
		||||
 | 
			
		||||
# set local compilation flags for IGT tests
 | 
			
		||||
IGT_LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM -DANDROID -UNDEBUG
 | 
			
		||||
IGT_LOCAL_CFLAGS += -include "check-ndebug.h" -std=c99
 | 
			
		||||
IGT_LOCAL_CFLAGS += -include "check-ndebug.h" -std=gnu99
 | 
			
		||||
# FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit
 | 
			
		||||
IGT_LOCAL_CFLAGS += -Wno-error=return-type
 | 
			
		||||
# Excessive complaining for established cases. Rely on the Linux version warnings.
 | 
			
		||||
 | 
			
		||||
@ -12,7 +12,7 @@ define add_tool
 | 
			
		||||
    LOCAL_CFLAGS += -DHAVE_TERMIOS_H
 | 
			
		||||
    LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
 | 
			
		||||
    LOCAL_CFLAGS += -DANDROID -UNDEBUG
 | 
			
		||||
    LOCAL_CFLAGS += -std=c99
 | 
			
		||||
    LOCAL_CFLAGS += -std=gnu99
 | 
			
		||||
    # FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit
 | 
			
		||||
    LOCAL_CFLAGS += -Wno-error=return-type
 | 
			
		||||
    # Excessive complaining for established cases. Rely on the Linux version warnings.
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user