aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobin Ehlis <tobine@google.com>2016-03-08 10:39:10 -0700
committerTobin Ehlis <tobine@google.com>2016-03-08 10:44:05 -0700
commita3c30a57668994b068ac52457ad6c8bdfe5dc0db (patch)
treec8907bab9549c62bd87838d8ca5cee0f8760ff3b
parent611710a6946c5e59b6c4041a5e87cc6ecdc6e72c (diff)
downloadusermoji-a3c30a57668994b068ac52457ad6c8bdfe5dc0db.tar.xz
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.
-rwxr-xr-xvulkan.py5
1 files 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