| 修訂 | 4278458146582b6c12292f7e6be560aa126ad4f5 (tree) |
|---|---|
| 時間 | 2019-07-05 17:27:22 |
| 作者 | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
android: vulkan/util: fix generating vk_enum_to_str.*
The gen_enum_to_str.py generates vk_enum_to_str.c and its header at once.
However, the makefiles incorrectly list both files parallel with the same
recipes. That means both two files may be generated simultaneously by two
processes. The generating files may be truncated by another process, as
shown below:
$ cd $OUT/obj/STATIC_LIBRARIES/libmesa_vulkan_util_intermediates/util
$ ls -l
-rw-rw-r-- 1 lh lh 193713 Jul 5 13:31 vk_enum_to_str.c
-rw-rw-r-- 1 lh lh 4609 Jul 5 13:31 vk_enum_to_str.d
-rw-rw-r-- 1 lh lh 0 Jul 5 16:21 vk_enum_to_str.h
Let one file depends on the other with empty recipe to avoid the issue.
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
src/vulkan/Android.mk (diff)| @@ -46,14 +46,16 @@ LOCAL_SRC_FILES := $(VULKAN_UTIL_FILES) $(VULKAN_WSI_FILES) | ||
| 46 | 46 | |
| 47 | 47 | vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml |
| 48 | 48 | |
| 49 | -$(LOCAL_GENERATED_SOURCES): $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \ | |
| 49 | +$(firstword $(LOCAL_GENERATED_SOURCES)): $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \ | |
| 50 | 50 | $(vulkan_api_xml) |
| 51 | 51 | @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" |
| 52 | 52 | @mkdir -p $(dir $@) |
| 53 | - $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \ | |
| 53 | + $(hide) $(MESA_PYTHON2) $< \ | |
| 54 | 54 | --xml $(vulkan_api_xml) \ |
| 55 | 55 | --outdir $(dir $@) |
| 56 | 56 | |
| 57 | +$(lastword $(LOCAL_GENERATED_SOURCES)): $(firstword $(LOCAL_GENERATED_SOURCES)) | |
| 58 | + | |
| 57 | 59 | LOCAL_EXPORT_C_INCLUDE_DIRS := \ |
| 58 | 60 | $(intermediates) |
| 59 | 61 |
Android-x86
Fork