commit f38489f1e65cf3836f43e8cf641616fc1866aaa4
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 23 22:49:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 23 22:49:45 2018 +0000
tree 6f7218008d0edf6ce7962e29b187239e3ea85726
parent ecae6b2b897d6df51498b104142e413127a70e26
parent e1fdef84a6bd38e4ec8d907aabb1774c7008f689

Merge "Move ndk-gdb out of HostTools."

checkbuild.py

diff --git a/checkbuild.py b/checkbuild.py
index 7f1dc7f..2df8fc9 100755
--- a/checkbuild.py
+++ b/checkbuild.py
@@ -1584,6 +1584,8 @@
         print('Constructing Vulkan validation layer source...')
         vulkan_root_dir = ndk.paths.android_path(
             'external/vulkan-validation-layers')
+        vulkan_headers_root_dir = ndk.paths.android_path(
+            'external/vulkan-headers')
 
         copies = [
             {
@@ -1592,17 +1594,17 @@
                 'files': [
                 ],
                 'dirs': [
-                    'layers', 'include', 'tests', 'common', 'libs', 'scripts'
+                    'layers', 'tests', 'scripts'
                 ],
             },
             {
-                'source_dir': vulkan_root_dir + '/loader',
-                'dest_dir': 'vulkan/src/loader',
+                'source_dir': vulkan_headers_root_dir,
+                'dest_dir': 'vulkan/src',
                 'files': [
-                    'vk_loader_platform.h',
-                    'vk_loader_layer.h'
                 ],
-                'dirs': [],
+                'dirs': [
+                    'include', 'registry'
+                ],
             }
         ]
 
@@ -1643,7 +1645,8 @@
         print('Copying finished')
 
         build_cmd = [
-            'bash', vulkan_path + '/build-android/android-generate.sh'
+            'bash', vulkan_path + '/build-android/android-generate.sh',
+                    vulkan_path + '/registry'
         ]
         print('Generating generated layers...')
         subprocess.check_call(build_cmd)