zach feedback

shell/config.gni

@@ -10,7 +10,6 @@ declare_args() {
   shell_enable_vulkan = false
 
   shell_enable_software = true
-  enable_vulkan_validation_layers = false
 }
 
 declare_args() {

shell/platform/android/BUILD.gn

@@ -6,9 +6,11 @@ import("//build/config/android/config.gni")
 import("//build/toolchain/clang.gni")
 import("//flutter/build/zip_bundle.gni")
 import("//flutter/common/config.gni")
+import("//flutter/impeller/tools/impeller.gni")
 import("//flutter/shell/config.gni")
 import("//flutter/shell/gpu/gpu.gni")
 import("//flutter/shell/version/version.gni")
+import("//flutter/vulkan/config.gni")
 
 shell_gpu_configuration("android_gpu_configuration") {
   enable_software = true
@@ -479,6 +481,7 @@ action("android_jar") {
   ]
 
   if (enable_vulkan_validation_layers) {
+    assert(impeller_enable_vulkan)
     deps += [ "//third_party/vulkan_validation_layers" ]
     args += [
       "--native_lib",

tools/gn

@@ -551,7 +551,7 @@ def to_gn_args(args):
 
   if args.enable_vulkan_validation_layers:
     if args.target_os == 'android':
-      gn_args['android_api_level'] = int(26)
+      gn_args['android_api_level'] = 26
     gn_args['enable_vulkan_validation_layers'] = True
 
   # Enable pointer compression on 64-bit mobile targets. iOS is excluded due to

vulkan/config.gni

@@ -3,4 +3,6 @@
 # found in the LICENSE file.
 
 declare_args() {
+  # Whether to include vulkan validation layers.
+  enable_vulkan_validation_layers = false
 }