From a3c30a57668994b068ac52457ad6c8bdfe5dc0db Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Tue, 8 Mar 2016 10:39:10 -0700 Subject: layers: Fix android build from linux or Win32 system When we codegen layers for android build, cmd line is long which was causing us to not customize build based on "Android" option on cmd line. Handling "Android" as special case currently so android can easily be built from Win32 or linux. Need to clean this code up at some point to make it easier to build various targets from different dev system types. --- vulkan.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vulkan.py b/vulkan.py index a081fa90..11d196ab 100755 --- a/vulkan.py +++ b/vulkan.py @@ -1228,10 +1228,11 @@ lunarg_debug_report = Extension( import sys if len(sys.argv) > 3: - if sys.platform.startswith('win32'): +# TODO : Need to clean this up to more seemlessly handle building different targets than the platform you're on + if sys.platform.startswith('win32') and sys.argv[1] != 'Android': extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_win32_surface] extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_win32_surface, lunarg_debug_report] - elif sys.platform.startswith('linux'): + elif sys.platform.startswith('linux') and sys.argv[1] != 'Android': extensions = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface] extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, ext_khr_xcb_surface, lunarg_debug_report] else: # android -- cgit v1.2.3