gfxstream: fix Linux guest build
After the move, various fixes are needed.
- Need to re-order directories in top-level meson file
- Need to add certain include dirs
- Use internal Vulkan headers. These unforunately define
Android extensions even on Linux guests, so we need a
(LINUX_GUEST_BUILD) guard until we can fix that.
BUG=202552093
TEST=compile
Change-Id: If806502e19c40a727f16b011e37da98feaa1e9df
diff --git a/guest/OpenglSystemCommon/meson.build b/guest/OpenglSystemCommon/meson.build
index 2b834d9..7abf885 100644
--- a/guest/OpenglSystemCommon/meson.build
+++ b/guest/OpenglSystemCommon/meson.build
@@ -14,8 +14,8 @@
'stream',
files_lib_stream,
cpp_args: cpp_args,
- include_directories: [inc_host, inc_opengl_codec, inc_android_emu,
- inc_render_enc, inc_android_compat,
+ include_directories: [inc_vulkan_headers, inc_host, inc_opengl_codec,
+ inc_android_emu, inc_render_enc, inc_android_compat,
inc_qemu_pipe, inc_qemu_pipe_types, inc_gralloc,
inc_vulkan_enc, inc_goldfish_address_space,
inc_system, inc_platform],
