From a5f445640e8e74a2fe44b684db973c3a518dd1d8 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sat, 20 Aug 2016 00:04:29 +0200 Subject: [PATCH] android: i965: add per-gen libmesa_i965_gen{8,9} static Needed to fix android build after commit 16a9fcb which enabled genxml for gen{8,9} state setup This is the last patch needed, android build tested successfully. --- src/mesa/drivers/dri/i965/Android.mk | 46 +++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index d4c4628f366..971c3c58e8a 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -42,7 +42,9 @@ I965_PERGEN_STATIC_LIBRARIES := \ I965_PERGEN_LIBS := \ libmesa_i965_gen6 \ libmesa_i965_gen7 \ - libmesa_i965_gen75 + libmesa_i965_gen75 \ + libmesa_i965_gen8 \ + libmesa_i965_gen9 # --------------------------------------- # Build libmesa_i965_gen6 @@ -107,6 +109,48 @@ LOCAL_CFLAGS := -DGEN_VERSIONx10=75 include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) +# --------------------------------------- +# Build libmesa_i965_gen8 +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_i965_gen8 + +LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) + +LOCAL_SRC_FILES := $(i965_gen8_FILES) + +LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) + +LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) + +LOCAL_CFLAGS := -DGEN_VERSIONx10=80 + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +# --------------------------------------- +# Build libmesa_i965_gen9 +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_i965_gen9 + +LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) + +LOCAL_SRC_FILES := $(i965_gen9_FILES) + +LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) + +LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) + +LOCAL_CFLAGS := -DGEN_VERSIONx10=90 + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + # --------------------------------------- # Build i965_dri # --------------------------------------- -- 2.30.2