Compile Vulkan when building for the Android framework.

gyp/gpu.gyp

Index: gyp/gpu.gyp
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 874db5cb67c05e431d7688f3726b780dc28584f6..77c99ea40c09f4e2426271c6908c8b19942fc2fc 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -88,6 +88,7 @@
         'utils.gyp:utils',
         'etc1.gyp:libetc1',
         'ktx.gyp:libSkKTX',
+        'shaderc.gyp:shaderc_combined',

[egdaniel, 2016/07/06 15:21:05]

should this not be under the skia_vulkan section?

[djsollen, 2016/07/06 15:42:18]

Done.

         'sksl.gyp:sksl',
       ],
       'includes': [
@@ -225,18 +226,32 @@
                 'library_dirs': [ '<(vulkan_sdk_path)/lib', ],
               },
             }],
+            [ 'skia_android_framework', {
+              'include_dirs': [
+                'frameworks/native/vulkan/include',
+                '../tools/viewer/sk_app',
+                '../tools/viewer/sk_app/android',
+              ],
+              'direct_dependent_settings': {
+                'include_dirs': [
+                  'frameworks/native/vulkan/include',
+                  '../tools/viewer/sk_app',
+                  '../tools/viewer/sk_app/android',
+                ],
+              },
+              'dependencies!': [
+                'shaderc.gyp:shaderc_combined',
+              ],
+              'sources': [
+                # the gyp -> android.mk generator doesn't seem to like cpp files
+                # in directories outside of src, bench, or dm.  Until this gets fixed
+                # I just start the path in the src directory.
+                '<(skia_src_path)/../tools/viewer/sk_app/WindowContext.cpp', 
+                '<(skia_src_path)/../tools/viewer/sk_app/VulkanWindowContext.cpp',
+                '<(skia_src_path)/../tools/viewer/sk_app/android/VulkanWindowContext_android.cpp'
+              ],
+            }],
           ],
-          'dependencies': [
-            'shaderc.gyp:shaderc_combined',
-          ],
-          'include_dirs': [
-            '../third_party/externals/shaderc2/libshaderc/include',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '../third_party/externals/shaderc2/libshaderc/include',
-            ],
-          },
           'link_settings': {
             'libraries': [ '<(vulkan_lib_name)', ],
           },