VulkanViewer on Android

gyp/shaderc.gyp

Index: gyp/shaderc.gyp
diff --git a/gyp/shaderc.gyp b/gyp/shaderc.gyp
index 7732e221ac049547005717b29367c9b6fa563df1..32026850afa1803b10a9235ffe67083a1b2e0617 100644
--- a/gyp/shaderc.gyp
+++ b/gyp/shaderc.gyp
@@ -28,13 +28,14 @@
           'shaderc_project_type' : 'ninja',
         }],
       ],
-      'shaderc_out_path': '../out/<(CONFIGURATION_NAME)/shaderc_out_<(skia_arch_type)',
+      'shaderc_out_path': '<(PRODUCT_DIR)/shaderc_out_<(skia_arch_type)',
     },
     # Export out of nested variables.
     'shaderc_build_configuration': '<(shaderc_build_configuration)',
     'shaderc_project_type': '<(shaderc_project_type)',
     'shaderc_out_path': '<(shaderc_out_path)',
     'shaderc_lib_name': '<(shaderc_lib_name)',
+    'android_toolchain%': '',
     
     # On Windows the library winds up inside a 'Debug' or 'Release' dir, not so
     # with ninja project build.
@@ -62,12 +63,12 @@
           'outputs': [
              '<(shaderc_lib_full_path)',
           ],
-          'action': ['python', '../tools/build_shaderc.py', '-s', '../third_party/externals/shaderc2', '-o', '<(shaderc_out_path)', '-a', '<(skia_arch_type)', '-t', '<(shaderc_build_configuration)', '-p', '<(shaderc_project_type)'],
+          'action': ['python', '../tools/build_shaderc.py', '-s', '../third_party/externals/shaderc2', '-o', '<(shaderc_out_path)', '-a', '<(skia_arch_type)', '-t', '<(shaderc_build_configuration)', '-p', '<(shaderc_project_type)', '-c', '<(android_toolchain)'],
         },
       ],     
       'copies': [
         {
-          'destination': '../out/<(CONFIGURATION_NAME)',
+          'destination': '<(PRODUCT_DIR)',
           'files': ['<(shaderc_lib_full_path)'],
         },
       ],