commit aa585bf33bc7075f44f3d4200c0a78f0a2adef11
author Cody Northrop <cnorthrop@google.com> Fri Jul 26 08:57:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 26 08:57:02 2019 -0700
tree 86f0414c7c5d2ca82ce61b58463d7e71f3ed19b9
parent cedd59ffb5be54bc3dd098eadbbe7d8461fd9cef
parent b3be254143110254d93b1b00f75d9bb1af288bf9

vulkan: Remove file generation script am: ff5dea6526 am: 7ae0358e7e am: 15c4377cb0
am: b3be254143

Change-Id: I5d5b388f53e4f7ee555738b94605fd655b5eb7cd

build-android/build.py

diff --git a/build-android/build.py b/build-android/build.py
index 4cee830..77faea1 100755
--- a/build-android/build.py
+++ b/build-android/build.py
@@ -270,14 +270,6 @@
   print('Constructing Vulkan validation layer source...')
 
   build_cmd = [
-    'bash', build_dir + '/vulkan/src/build-android/android-generate.sh',
-            build_dir + '/vulkan/src/registry'
-  ]
-  print('Generating generated layers...')
-  subprocess.check_call(build_cmd)
-  print('Generation finished')
-
-  build_cmd = [
     'bash', ndk_build, '-C', build_dir + '/vulkan/src/build-android',
     jobs_arg(),
     'APP_ABI=' + ' '.join(abis),

layers/core_validation.cpp

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 87bca4c..03303f1 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -8866,7 +8866,7 @@
 QueryState CoreChecks::GetQueryState(QUEUE_STATE *queue_data, VkQueryPool queryPool, uint32_t queryIndex) {
     QueryObject query = {queryPool, queryIndex};
 
-    const std::array<decltype(queryToStateMap) *, 2> map_list = {&queue_data->queryToStateMap, &queryToStateMap};
+    const std::array<decltype(queryToStateMap) *, 2> map_list = {{&queue_data->queryToStateMap, &queryToStateMap}};
 
     for (const auto map : map_list) {
         auto query_data = map->find(query);