Compile Vulkan when building for the Android framework.

gyp/gpu.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # GYP for building gpu
 {
   'target_defaults': {
     'conditions': [
       ['skia_os != "win"', {
         'sources/': [ ['exclude', '_win.(h|cpp)$'],
@@ skipping 70 matching lines @@
     {
       'target_name': 'skgpu',
       'product_name': 'skia_skgpu',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         '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': [
         'gpu.gypi',
       ],
       'include_dirs': [
         '../include/gpu',
         '../include/private',
         '../src/core',
         '../src/gpu',
@@ skipping 117 matching lines @@
               ],
               'direct_dependent_settings': {
                 'include_dirs': [
                   '<(vulkan_sdk_path)/include',
                 ],
               },
               'link_settings': {
                 '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)', ],
           },
         }, {
           'sources!': [
             '<@(skgpu_vk_sources)',
           ],
         }],
       ],
     },
   ],
 }