Revert "Revert "Add define to use customize vulkan header.""

This reverts commit b351817588baf94ac725e35f10ee1d5ff8178834.

Reason for revert: Relanding with android fixes

Original change's description:
> Revert "Add define to use customize vulkan header."
>
> This reverts commit a492eb0e1f08311bfa47f46c660144e7bc8a6c0e.
>
> Reason for revert: Breaking Android roll (b/c builds tools?)
>
> Original change's description:
> > Add define to use customize vulkan header.
> >
> > Bug: skia:
> > Change-Id: Ia87c81a54603a02b2f8f51a735bf173a49afe6c7
> > Reviewed-on: https://skia-review.googlesource.com/81121
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=egdaniel@google.com,bsalomon@google.com
>
> Change-Id: I80a685bf88af909865f274ffc61686be57e8c313
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/81740
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=egdaniel@google.com,bsalomon@google.com

Change-Id: Ia701e884bfa3799dc73002f892feb2ecafe9da12
Reviewed-on: https://skia-review.googlesource.com/81742
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py
index 20260926a9..3a1238bf20 100644
--- a/gn/gn_to_bp.py
+++ b/gn/gn_to_bp.py
@@ -177,6 +177,7 @@ gn_args = {
   'skia_use_vulkan':    'true',
   'target_cpu':         '"none"',
   'target_os':          '"android"',
+  'skia_vulkan_header': '"Skia_Vulkan_Android.h"',
 }
 gn_args = ' '.join(sorted('%s=%s' % (k,v) for (k,v) in gn_args.iteritems()))
 
@@ -241,6 +242,11 @@ cflags_cc.add("-fexceptions")
 cflags = sorted(cflags)
 cflags.insert(0, "-U_FORTIFY_SOURCE")
 
+# We need to add the include path to the vulkan defines and header file set in
+# then skia_vulkan_header gn arg that is used for framework builds.
+local_includes.add("platform_tools/android/vulkan")
+export_includes.add("platform_tools/android/vulkan")
+
 # Most defines go into SkUserConfig.h, where they're seen by Skia and its users.
 defines = [str(d) for d in js['targets']['//:skia']['defines']]
 defines.remove('NDEBUG')                 # Let the Android build control this.