Android.mk: better fallback for SPIRV-Tools dir (google#538)

This fixes building with ndk-build when the source tree is laid out like in the Android NDK.
dneto0 · Jan 11, 2019 · 14ae0de · 14ae0de
1 parent 6733f17
commit 14ae0de
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/third_party/Android.mk b/third_party/Android.mk
@@ -12,7 +12,12 @@ ifeq ($(SPVTOOLS_LOCAL_PATH),)
   SPVTOOLS_LOCAL_PATH:=$(THIRD_PARTY_PATH)/spirv-tools
 endif
 ifeq ($(SPVHEADERS_LOCAL_PATH),)
-	SPVHEADERS_LOCAL_PATH:=$(THIRD_PARTY_PATH)/spirv-headers
+   # Use the third party dir if it exists.
+   ifneq ($(wildcard $(THIRD_PARTY_PATH)/spirv-headers/include/spirv/spirv.xml),)
+     SPVHEADERS_LOCAL_PATH:=$(THIRD_PARTY_PATH)/spirv-headers
+   else
+     # Let SPIRV-Tools find its own headers and hope for the best.
+   endif
 endif
 
 # Now include the SPIRV-Tools dependency