ANDROID: prebuild: compiler/Android.nir.gen.mk: Use precompiled intermediate sources
Certain code in Mesa is generated by python scripts that
want modules that aren't part of Android's standard build
requirements. This patch introduces changes to Android.mk
files and aosp-gen-prebuilt.sh script to generate and use
pre-generated versions of those files.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Change-Id: I7d8742bcf15a453e66f7c77c6806aefa96ca3f72
diff --git a/aosp-gen-prebuilt.sh b/aosp-gen-prebuilt.sh
index 5e389a0..92ece56 100755
--- a/aosp-gen-prebuilt.sh
+++ b/aosp-gen-prebuilt.sh
@@ -21,6 +21,7 @@
python src/compiler/spirv/spirv_info_c.py src/compiler/spirv/spirv.core.grammar.json prebuilt-intermediates/spirv/spirv_info.c || ( prebuilt-intermediates/spirv/spirv_info.c; false)
python src/compiler/spirv/vtn_gather_types_c.py src/compiler/spirv/spirv.core.grammar.json prebuilt-intermediates/spirv/vtn_gather_types.c || ( prebuilt-intermediates/spirv/vtn_gather_types.c; false)
+python src/compiler/spirv/vtn_generator_ids_h.py src/compiler/spirv/spir-v.xml prebuilt-intermediates/spirv/vtn_generator_ids.h
python src/util/format_srgb.py > prebuilt-intermediates/util/format_srgb.c
diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk
index 7e736f4..20e5bb1 100644
--- a/src/compiler/Android.nir.gen.mk
+++ b/src/compiler/Android.nir.gen.mk
@@ -79,9 +79,9 @@
@mkdir -p $(dir $@)
@cp -f $< $@
-$(intermediates)/spirv/vtn_generator_ids.h: $(LOCAL_PATH)/spirv/vtn_generator_ids_h.py $(LOCAL_PATH)/spirv/spir-v.xml
+$(intermediates)/spirv/vtn_generator_ids.h: $(prebuilt_intermediates)/spirv/vtn_generator_ids.h
@mkdir -p $(dir $@)
- $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false)
+ @cp -f $< $@
nir_intrinsics_h_gen := $(LOCAL_PATH)/nir/nir_intrinsics_h.py
$(intermediates)/nir/nir_intrinsics.h: $(prebuilt_intermediates)/nir/nir_intrinsics.h
