summaryrefslogtreecommitdiff
path: root/src/vulkan
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2017-03-03 12:52:56 +0200
committerEmil Velikov <emil.l.velikov@gmail.com>2017-03-04 16:38:33 +0000
commit66b62be4bb546de3a5bd10968f11cd892ca7d189 (patch)
tree33aba9b2d466a0bf8b63e2cf75d03061673f77ef /src/vulkan
parent2acc69da8cefe622139d38985af897be5be1e169 (diff)
android: fix outdir for gen_enum_to_str files
when files are being generated the value of $intermediates var content can be completely random, this makes sure that outdir is the wanted one. Fixes: 3f2cb699 ("android: vulkan: add support for libmesa_vulkan_util") Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Acked-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/vulkan')
-rw-r--r--src/vulkan/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk
index 9f71d8ff8f3..7653f34c68a 100644
--- a/src/vulkan/Android.mk
+++ b/src/vulkan/Android.mk
@@ -1,4 +1,5 @@
# Copyright © 2017 Mauro Rossi <issor.oruam@gmail.com>
+# Copyright © 2017 Intel Corporation
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -45,7 +46,7 @@ vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml
$(LOCAL_GENERATED_SOURCES): $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py $(vulkan_api_xml)
@echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))"
@mkdir -p $(dir $@)
- $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py --xml $(vulkan_api_xml) --outdir $(intermediates)/util
+ $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py --xml $(vulkan_api_xml) --outdir $(dir $@)
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(intermediates)