commit c963c98ff9e641ed6a06c5af8e9258468aee8f41
author Kaiyi Li <kaiyili@google.com> Fri Sep 30 13:59:33 2022 -0700
committer Kaiyi Li <kaiyili@google.com> Fri Sep 30 14:00:03 2022 -0700
tree e01b61d995674d1c46ff093fe12064102a0adc08
parent 446d69027a1542b8f741473a9af199fd01a4a657

Fix base headers paths

Test: build
Change-Id: Iede5c7a5ab11f6c5a9b8c87f62d70132ef74171a

registry/vulkan/scripts/cerealgenerator.py

diff --git a/registry/vulkan/scripts/cerealgenerator.py b/registry/vulkan/scripts/cerealgenerator.py
index 3adc29f..783401e 100644
--- a/registry/vulkan/scripts/cerealgenerator.py
+++ b/registry/vulkan/scripts/cerealgenerator.py
@@ -248,7 +248,7 @@
 #include "goldfish_vk_private_defs.h"
 
 #include "%s.h"
-#include "{self.baseLibDirPrefix}/StreamSerializing.h"
+#include "{self.baseLibDirPrefix}/files/StreamSerializing.h"
 """ % VULKAN_STREAM_TYPE
 
         testingInclude = f"""
@@ -372,7 +372,7 @@
 #include "VkDecoderGlobalState.h"
 #include "VkReconstruction.h"
 
-#include "{self.baseLibDirPrefix}/Lock.h"
+#include "{self.baseLibDirPrefix}/synchronization/Lock.h"
 """
 
         decoderHeaderIncludes = f"""
@@ -395,7 +395,7 @@
 #include "common/goldfish_vk_transform.h"
 
 #include "{self.baseLibDirPrefix}/BumpPool.h"
-#include "{self.baseLibDirPrefix}/System.h"
+#include "{self.baseLibDirPrefix}/system/System.h"
 #include "{self.baseLibDirPrefix}/Tracing.h"
 #include "{self.baseLibDirPrefix}/Metrics.h"
 #include "stream-servers/IOStream.h"