<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Mar 2, 2017 at 5:41 AM, Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Cc: Mauro Rossi <<a href="mailto:issor.oruam@gmail.com">issor.oruam@gmail.com</a>> Cc: Tapani Pälli <<a href="mailto:tapani.palli@intel.com">tapani.palli@intel.com</a>> Cc: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>> --- All, here is a 5min attempt to fix the Android build. Tapani, Mauro do give it a test since I've done an educated guess here. Pull Jason's branch and apply on top. <a href="https://cgit.freedesktop.org/~jekstrand/mesa/log/?h=wip/move-compiler" rel="noreferrer" target="_blank">https://cgit.freedesktop.org/~jekstrand/mesa/log/?h=wip/move-compiler</a></blockquote><div> </div><div>Yes, please. There isn't a huge rush since we're not going to move it for few weeks, but the Android build patch shouldn't go stale. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> --- .../<a href="http://Android.gen.mk" rel="noreferrer" target="_blank">Android.gen.mk</a> => intel/<a href="http://Android.compiler.mk" rel="noreferrer" target="_blank">Android.compiler.mk</a>} | 34 ++++++++++++++++++---- src/intel/Android.mk | 1 + src/mesa/drivers/dri/i965/Android.mk | 30 ++----------------- 3 files changed, 31 insertions(+), 34 deletions(-) rename src/{mesa/drivers/dri/i965/<a href="http://Android.gen.mk" rel="noreferrer" target="_blank">Android.gen.mk</a> => intel/<a href="http://Android.compiler.mk" rel="noreferrer" target="_blank">Android.compiler.mk</a>} (64%) diff --git a/src/mesa/drivers/dri/i965/<a href="http://Android.gen.mk" rel="noreferrer" target="_blank">Android.gen.mk</a> b/src/intel/<a href="http://Android.compiler.mk" rel="noreferrer" target="_blank">Android.compiler.mk</a> similarity index 64% rename from src/mesa/drivers/dri/i965/<a href="http://Android.gen.mk" rel="noreferrer" target="_blank">Android.gen.mk</a> rename to src/intel/<a href="http://Android.compiler.mk" rel="noreferrer" target="_blank">Android.compiler.mk</a> index c2b8dae339..2d4ba91396 100644 --- a/src/mesa/drivers/dri/i965/<a href="http://Android.gen.mk" rel="noreferrer" target="_blank">Android.gen.mk</a> +++ b/src/intel/<a href="http://Android.compiler.mk" rel="noreferrer" target="_blank">Android.compiler.mk</a> @@ -1,4 +1,7 @@ # +# Copyright (C) 2011 Intel Corporation +# Copyright (C) 2010-2011 Chia-I Wu <<a href="mailto:olvaffe@gmail.com">olvaffe@gmail.com</a>> +# Copyright (C) 2010-2011 LunarG # Copyright (C) 2016 Linaro, Ltd., Rob Herring <<a href="mailto:robh@kernel.org">robh@kernel.org</a>> # # Permission is hereby granted, free of charge, to any person obtaining a @@ -20,21 +23,40 @@ # DEALINGS IN THE SOFTWARE. # -ifeq ($(LOCAL_MODULE_CLASS),) -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -endif +# --------------------------------------- +# Build libmesa_intel_compiler +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_intel_compiler +LOCAL_MODULE_CLASS := STATIC_LIBRARIES + +LOCAL_SRC_FILES := \ + $(COMPILER_FILES) + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/intel \ + $(MESA_TOP)/src/compiler/nir \ + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir + +LOCAL_SHARED_LIBRARIES := \ + libdrm_intel brw_nir_trig_workarounds_deps := \ - $(LOCAL_PATH)/brw_nir_trig_workarounds.py \ + $(LOCAL_PATH)/compiler/brw_nir_trig_workarounds.py \ $(MESA_TOP)/src/compiler/nir/nir_algebraic.py intermediates := $(call local-generated-sources-dir) -$(intermediates)/brw_nir_trig_workarounds.c: $(brw_nir_trig_workarounds_deps) +$(intermediates)/compiler/brw_nir_trig_workarounds.c: $(brw_nir_trig_workarounds_deps) @mkdir -p $(dir $@) $(hide) PYTHONPATH=$(MESA_TOP)/src/compiler/nir $(MESA_PYTHON2) $< > $@ LOCAL_STATIC_LIBRARIES = libmesa_genxml LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(i965_compiler_GENERATED_FILES)) + $(COMPILER_GENERATED_FILES)) + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) diff --git a/src/intel/Android.mk b/src/intel/Android.mk index 7cb2bb9f8d..db6c770f35 100644 --- a/src/intel/Android.mk +++ b/src/intel/Android.mk @@ -27,6 +27,7 @@ include $(LOCAL_PATH)/Makefile.sources include $(LOCAL_PATH)/<a href="http://Android.blorp.mk" rel="noreferrer" target="_blank">Android.blorp.mk</a> include $(LOCAL_PATH)/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> +include $(LOCAL_PATH)/<a href="http://Android.compiler.mk" rel="noreferrer" target="_blank">Android.compiler.mk</a> include $(LOCAL_PATH)/<a href="http://Android.genxml.mk" rel="noreferrer" target="_blank">Android.genxml.mk</a> include $(LOCAL_PATH)/<a href="http://Android.isl.mk" rel="noreferrer" target="_blank">Android.isl.mk</a> include $(LOCAL_PATH)/<a href="http://Android.vulkan.mk" rel="noreferrer" target="_blank">Android.vulkan.mk</a> diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 7dea3c2507..708851c866 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -152,32 +152,6 @@ include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) # --------------------------------------- -# Build libmesa_i965_compiler -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_i965_compiler -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := \ - $(i965_compiler_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_DRI_C_INCLUDES) \ - $(MESA_TOP)/src/intel \ - $(MESA_TOP)/src/compiler/nir \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,,)/glsl - -LOCAL_SHARED_LIBRARIES := \ - libdrm_intel - -include $(LOCAL_PATH)/<a href="http://Android.gen.mk" rel="noreferrer" target="_blank">Android.gen.mk</a> -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- # Build i965_dri # --------------------------------------- @@ -209,9 +183,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ $(MESA_DRI_WHOLE_STATIC_LIBRARIES) \ $(I965_PERGEN_LIBS) \ libmesa_intel_common \ - libmesa_blorp \ libmesa_isl \ - libmesa_i965_compiler + libmesa_blorp \ + libmesa_intel_compiler LOCAL_SHARED_LIBRARIES := \ $(MESA_DRI_SHARED_LIBRARIES) \ -- 2.11.1 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>