diff options
| author | Mauro Rossi <issor.oruam@gmail.com> | 2017-05-06 16:03:23 +0200 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2017-05-09 08:04:09 +0300 |
| commit | 7993823d381be38fba9ba3901be3658843abcad4 (patch) | |
| tree | ecf7a13abf42ff8ff4657fc0d78fe4b1894047dc | |
| parent | 909f72e0a2178ede4497c352933c608e6e8dab00 (diff) | |
android: i965: add per-gen libmesa_i965_gen{4,45,5} static
Needed to fix android building errors:
external/mesa/src/mesa/drivers/dri/i965/brw_state_upload.c:148: error: undefined reference to 'gen5_init_atoms'
external/mesa/src/mesa/drivers/dri/i965/brw_state_upload.c:150: error: undefined reference to 'gen45_init_atoms'
external/mesa/src/mesa/drivers/dri/i965/brw_state_upload.c:152: error: undefined reference to 'gen4_init_atoms'
clang++: error: linker command failed with exit code 1 (use -v to see invocation)
Fixes: 5a19d0b ("i965: Get real per-gen atom lists")
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
| -rw-r--r-- | src/mesa/drivers/dri/i965/Android.mk | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index ac0a4446b9..7c4fadaa46 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -40,6 +40,9 @@ I965_PERGEN_STATIC_LIBRARIES := \ libmesa_nir I965_PERGEN_LIBS := \ + libmesa_i965_gen4 \ + libmesa_i965_gen45 \ + libmesa_i965_gen5 \ libmesa_i965_gen6 \ libmesa_i965_gen7 \ libmesa_i965_gen75 \ @@ -47,6 +50,69 @@ I965_PERGEN_LIBS := \ libmesa_i965_gen9 # --------------------------------------- +# Build libmesa_i965_gen4 +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_i965_gen4 + +LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) + +LOCAL_SRC_FILES := $(i965_gen4_FILES) + +LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) + +LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) + +LOCAL_CFLAGS := -DGEN_VERSIONx10=40 + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +# --------------------------------------- +# Build libmesa_i965_gen45 +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_i965_gen45 + +LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) + +LOCAL_SRC_FILES := $(i965_gen45_FILES) + +LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) + +LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) + +LOCAL_CFLAGS := -DGEN_VERSIONx10=45 + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +# --------------------------------------- +# Build libmesa_i965_gen5 +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_i965_gen5 + +LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) + +LOCAL_SRC_FILES := $(i965_gen5_FILES) + +LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) + +LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) + +LOCAL_CFLAGS := -DGEN_VERSIONx10=50 + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +# --------------------------------------- # Build libmesa_i965_gen6 # --------------------------------------- |