Android build + shipt the correct files in the tarball.
---
Untested, but I'm 90% sure that it'll do.
src/intel/isl/Android.mk | 7 ++++---
src/intel/isl/Makefile.am | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/intel/isl/Android.mk b/src/intel/isl/Android.mk
index 3134981..fd4248f 100644
--- a/src/intel/isl/Android.mk
+++ b/src/intel/isl/Android.mk
@@ -139,14 +139,15 @@ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/,
$(ISL_GENERATED_FILES)
define bash-gen
@mkdir -p $(dir $@)
@echo "Gen Bash: $(PRIVATE_MODULE) <= $(notdir $(@))"
- $(hide) $(PRIVATE_SCRIPT) < $(PRIVATE_CSV) > $@
+ $(hide) $(PRIVATE_SCRIPT) --csv $(PRIVATE_CSV) --out
$(ISL_GENERATED_FILES)
endef
isl_format_layout_deps := \
- $(LOCAL_PATH)/isl_format_layout_gen.bash \
+ $(LOCAL_PATH)/gen_format_layout.py \
+ $(LOCAL_PATH)/gen_format_layout.c.mako \
$(LOCAL_PATH)/isl_format_layout.csv
-$(intermediates)/isl_format_layout.c: PRIVATE_SCRIPT := bash -c
$(LOCAL_PATH)/isl_format_layout_gen.bash
+$(intermediates)/isl_format_layout.c: PRIVATE_SCRIPT := $(MESA_PYTHON2)
$(LOCAL_PATH)/gen_format_layout.py
$(intermediates)/isl_format_layout.c: PRIVATE_CSV :=
$(LOCAL_PATH)/isl_format_layout.csv
$(intermediates)/isl_format_layout.c: $(isl_format_layout_deps)
$(call bash-gen)
diff --git a/src/intel/isl/Makefile.am b/src/intel/isl/Makefile.am
index 74f863a..e35b474 100644
--- a/src/intel/isl/Makefile.am
+++ b/src/intel/isl/Makefile.am
@@ -87,6 +87,7 @@ tests_isl_surf_get_image_offset_test_LDADD = \
# ----------------------------------------------------------------------------
EXTRA_DIST = \
- isl_format_layout_gen.bash \
+ gen_format_layout.py \
+ gen_format_layout.c.mako \
isl_format_layout.csv \
README
--
2.8.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
