Regenerate CMakeLists after move
Bug: b/271464937
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Test: cd <emu-master-dev repo>/external/qemu &&
python android/build/python/cmake.py --feature no-rust
Test: cd <emu-master-dev repo>/external/qemu &&
python android/build/python/cmake.py --feature no-rust --gfxstream
Change-Id: I221daf332b0d412c597cfbc4930a9f1b1ca63ddc
diff --git a/guest/GLESv1/CMakeLists.txt b/guest/GLESv1/CMakeLists.txt
index d4e6ce5..cd785be 100644
--- a/guest/GLESv1/CMakeLists.txt
+++ b/guest/GLESv1/CMakeLists.txt
@@ -4,7 +4,7 @@
android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1/Android.mk" "e095cb082e3791719749cfc80b90560afd7348eb0d7895449d2509aa129bea75")
set(GLESv1_CM_emulation_src gl.cpp)
android_add_library(TARGET GLESv1_CM_emulation SHARED LICENSE Apache-2.0 SRC gl.cpp)
-target_include_directories(GLESv1_CM_emulation PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon/bionic-include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon ${GOLDFISH_DEVICE_ROOT}/bionic/libc/private ${GOLDFISH_DEVICE_ROOT}/bionic/libc/platform ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/shared/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/shared/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(GLESv1_CM_emulation PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon/bionic-include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon ${GOLDFISH_DEVICE_ROOT}/bionic/libc/private ${GOLDFISH_DEVICE_ROOT}/bionic/libc/platform ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(GLESv1_CM_emulation PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR" "-DLOG_TAG=\"GLES_emulation\"")
target_compile_options(GLESv1_CM_emulation PRIVATE "-fvisibility=default" "-Wno-unused-parameter")
target_link_libraries(GLESv1_CM_emulation PRIVATE OpenglSystemCommon android-emu-shared vulkan_enc gui log _renderControl_enc GLESv2_enc GLESv1_enc OpenglCodecCommon_host cutils utils androidemu PRIVATE gralloc_cb_host GoldfishAddressSpace_host platform_host qemupipe_host)
\ No newline at end of file
diff --git a/guest/GLESv1_enc/CMakeLists.txt b/guest/GLESv1_enc/CMakeLists.txt
index 1110a53..5bb8173 100644
--- a/guest/GLESv1_enc/CMakeLists.txt
+++ b/guest/GLESv1_enc/CMakeLists.txt
@@ -4,7 +4,7 @@
android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc/Android.mk" "953e6b7371d10eed63a4be555f8f1fb6f347338484a78102fa8f55dff96f5d3b")
set(GLESv1_enc_src GLEncoder.cpp GLEncoderUtils.cpp gl_client_context.cpp gl_enc.cpp gl_entry.cpp)
android_add_library(TARGET GLESv1_enc SHARED LICENSE Apache-2.0 SRC GLEncoder.cpp GLEncoderUtils.cpp gl_client_context.cpp gl_enc.cpp gl_entry.cpp)
-target_include_directories(GLESv1_enc PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(GLESv1_enc PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(GLESv1_enc PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR" "-DLOG_TAG=\"emuglGLESv1_enc\"")
target_compile_options(GLESv1_enc PRIVATE "-fvisibility=default" "-Wno-unused-parameter")
target_link_libraries(GLESv1_enc PRIVATE OpenglCodecCommon_host cutils utils log androidemu android-emu-shared PRIVATE qemupipe_host)
\ No newline at end of file
diff --git a/guest/GLESv2/CMakeLists.txt b/guest/GLESv2/CMakeLists.txt
index 9a933d3..f339020 100644
--- a/guest/GLESv2/CMakeLists.txt
+++ b/guest/GLESv2/CMakeLists.txt
@@ -4,7 +4,7 @@
android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2/Android.mk" "d8f9dda69ec57ad8b7a65f02c3335b16a4724f612dec1d1a2cd793c28c0a10f9")
set(GLESv2_emulation_src gl2.cpp)
android_add_library(TARGET GLESv2_emulation SHARED LICENSE Apache-2.0 SRC gl2.cpp)
-target_include_directories(GLESv2_emulation PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon/bionic-include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon ${GOLDFISH_DEVICE_ROOT}/bionic/libc/private ${GOLDFISH_DEVICE_ROOT}/bionic/libc/platform ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/shared/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/shared/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(GLESv2_emulation PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon/bionic-include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon ${GOLDFISH_DEVICE_ROOT}/bionic/libc/private ${GOLDFISH_DEVICE_ROOT}/bionic/libc/platform ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(GLESv2_emulation PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR" "-DLOG_TAG=\"GLESv2_emulation\"")
target_compile_options(GLESv2_emulation PRIVATE "-fvisibility=default" "-Wno-unused-parameter")
target_link_libraries(GLESv2_emulation PRIVATE OpenglSystemCommon android-emu-shared vulkan_enc gui log _renderControl_enc GLESv2_enc GLESv1_enc OpenglCodecCommon_host cutils utils androidemu PRIVATE gralloc_cb_host GoldfishAddressSpace_host platform_host qemupipe_host)
\ No newline at end of file
diff --git a/guest/GLESv2_enc/CMakeLists.txt b/guest/GLESv2_enc/CMakeLists.txt
index ea17d34..9ba7501 100644
--- a/guest/GLESv2_enc/CMakeLists.txt
+++ b/guest/GLESv2_enc/CMakeLists.txt
@@ -4,7 +4,7 @@
android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc/Android.mk" "df543672d1f36e43fb783b08200aa85dbf3a2e7167f8ecd7e4c01c80e6fd1650")
set(GLESv2_enc_src GL2EncoderUtils.cpp GL2Encoder.cpp GLESv2Validation.cpp gl2_client_context.cpp gl2_enc.cpp gl2_entry.cpp IOStream2.cpp)
android_add_library(TARGET GLESv2_enc SHARED LICENSE Apache-2.0 SRC GL2EncoderUtils.cpp GL2Encoder.cpp GLESv2Validation.cpp gl2_client_context.cpp gl2_enc.cpp gl2_entry.cpp IOStream2.cpp)
-target_include_directories(GLESv2_enc PRIVATE ${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(GLESv2_enc PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(GLESv2_enc PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR" "-DLOG_TAG=\"emuglGLESv2_enc\"")
target_compile_options(GLESv2_enc PRIVATE "-fvisibility=default" "-Wno-unused-parameter" "-Wno-unused-private-field")
target_link_libraries(GLESv2_enc PRIVATE OpenglCodecCommon_host cutils utils log androidemu android-emu-shared PRIVATE qemupipe_host)
\ No newline at end of file
diff --git a/guest/GoldfishAddressSpace/CMakeLists.txt b/guest/GoldfishAddressSpace/CMakeLists.txt
index 411000f..e3d66ef 100644
--- a/guest/GoldfishAddressSpace/CMakeLists.txt
+++ b/guest/GoldfishAddressSpace/CMakeLists.txt
@@ -1,10 +1,10 @@
# This is an autogenerated file! Do not edit!
# instead run make from .../device/generic/goldfish-opengl
# which will re-generate this file.
-android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/shared/GoldfishAddressSpace/Android.mk" "a8b27a12e9d8e1cf4679c3ee1007f5ce8e846d7b07e6956c6eb46be289af9365")
+android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GoldfishAddressSpace/Android.mk" "a8b27a12e9d8e1cf4679c3ee1007f5ce8e846d7b07e6956c6eb46be289af9365")
set(GoldfishAddressSpace_host_src goldfish_address_space.cpp)
android_add_library(TARGET GoldfishAddressSpace_host LICENSE Apache-2.0 SRC goldfish_address_space.cpp)
-target_include_directories(GoldfishAddressSpace_host PRIVATE ${GOLDFISH_DEVICE_ROOT}/shared/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest ${GOLDFISH_DEVICE_ROOT}/device/generic/goldfish-opengl/system/include)
+target_include_directories(GoldfishAddressSpace_host PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest ${GOLDFISH_DEVICE_ROOT}/device/generic/goldfish-opengl/system/include)
target_compile_definitions(GoldfishAddressSpace_host PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR" "-DLOG_TAG=\"goldfish-address-space\"")
target_compile_options(GoldfishAddressSpace_host PRIVATE "-fvisibility=default" "-Wno-unused-parameter")
target_link_libraries(GoldfishAddressSpace_host PRIVATE log android-emu-shared)
\ No newline at end of file
diff --git a/guest/OpenglCodecCommon/CMakeLists.txt b/guest/OpenglCodecCommon/CMakeLists.txt
index 6a6f916..118a504 100644
--- a/guest/OpenglCodecCommon/CMakeLists.txt
+++ b/guest/OpenglCodecCommon/CMakeLists.txt
@@ -1,10 +1,10 @@
# This is an autogenerated file! Do not edit!
# instead run make from .../device/generic/goldfish-opengl
# which will re-generate this file.
-android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon/Android.mk" "7fbb167c6259be3e47f58d471b8dec45ee1f47aae2926ca89ba917fd72adab2b")
+android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglCodecCommon/Android.mk" "7fbb167c6259be3e47f58d471b8dec45ee1f47aae2926ca89ba917fd72adab2b")
set(OpenglCodecCommon_host_src EncoderDebug.cpp GLClientState.cpp GLESTextureUtils.cpp ChecksumCalculator.cpp GLSharedGroup.cpp glUtils.cpp IndexRangeCache.cpp SocketStream.cpp TcpStream.cpp auto_goldfish_dma_context.cpp etc.cpp goldfish_dma_host.cpp)
android_add_library(TARGET OpenglCodecCommon_host SHARED LICENSE Apache-2.0 SRC EncoderDebug.cpp GLClientState.cpp GLESTextureUtils.cpp ChecksumCalculator.cpp GLSharedGroup.cpp glUtils.cpp IndexRangeCache.cpp SocketStream.cpp TcpStream.cpp auto_goldfish_dma_context.cpp etc.cpp goldfish_dma_host.cpp)
-target_include_directories(OpenglCodecCommon_host PRIVATE ${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(OpenglCodecCommon_host PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(OpenglCodecCommon_host PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR" "-DLOG_TAG=\"eglCodecCommon\"")
target_compile_options(OpenglCodecCommon_host PRIVATE "-fvisibility=default" "-Wno-unused-parameter" "-Wno-unused-private-field")
target_link_libraries(OpenglCodecCommon_host PRIVATE cutils utils log androidemu android-emu-shared PRIVATE qemupipe_host)
\ No newline at end of file
diff --git a/guest/OpenglSystemCommon/CMakeLists.txt b/guest/OpenglSystemCommon/CMakeLists.txt
index ba7090a..bf27325 100644
--- a/guest/OpenglSystemCommon/CMakeLists.txt
+++ b/guest/OpenglSystemCommon/CMakeLists.txt
@@ -4,7 +4,7 @@
android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon/Android.mk" "5086200ad090dcbd2e94e4d253914680c8f0b5feea92776c0f64cbdd7fe4e4fa")
set(OpenglSystemCommon_src FormatConversions.cpp HostConnection.cpp QemuPipeStream.cpp ProcessPipe.cpp ThreadInfo.cpp AddressSpaceStream.cpp)
android_add_library(TARGET OpenglSystemCommon SHARED LICENSE Apache-2.0 SRC FormatConversions.cpp HostConnection.cpp QemuPipeStream.cpp ProcessPipe.cpp ThreadInfo.cpp AddressSpaceStream.cpp)
-target_include_directories(OpenglSystemCommon PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon ${GOLDFISH_DEVICE_ROOT}/bionic/libc/platform ${GOLDFISH_DEVICE_ROOT}/bionic/libc/private ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon/bionic-include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/shared/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/shared/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(OpenglSystemCommon PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon ${GOLDFISH_DEVICE_ROOT}/bionic/libc/platform ${GOLDFISH_DEVICE_ROOT}/bionic/libc/private ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon/bionic-include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(OpenglSystemCommon PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR")
target_compile_options(OpenglSystemCommon PRIVATE "-fvisibility=default" "-Wno-unused-parameter" "-Wno-unused-variable" "-fno-emulated-tls")
target_link_libraries(OpenglSystemCommon PRIVATE android-emu-shared vulkan_enc gui log _renderControl_enc GLESv2_enc GLESv1_enc OpenglCodecCommon_host cutils utils androidemu PRIVATE gralloc_cb_host GoldfishAddressSpace_host platform_host qemupipe_host)
\ No newline at end of file
diff --git a/guest/android-emu/CMakeLists.txt b/guest/android-emu/CMakeLists.txt
index c14504b..55a9d41 100644
--- a/guest/android-emu/CMakeLists.txt
+++ b/guest/android-emu/CMakeLists.txt
@@ -1,20 +1,20 @@
# This is an autogenerated file! Do not edit!
# instead run make from .../device/generic/goldfish-opengl
# which will re-generate this file.
-android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/android-emu/Android.mk" "db8796ed60d925c8940c3ad8b125c0f8e8e6731f67d165040a6d478a8b894a0d")
+android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu/Android.mk" "db8796ed60d925c8940c3ad8b125c0f8e8e6731f67d165040a6d478a8b894a0d")
set(androidemu_src aemu/base/AlignedBuf.cpp aemu/base/files/MemStream.cpp aemu/base/files/Stream.cpp aemu/base/files/StreamSerializing.cpp aemu/base/Pool.cpp aemu/base/StringFormat.cpp aemu/base/Process.cpp aemu/base/AndroidSubAllocator.cpp aemu/base/synchronization/AndroidMessageChannel.cpp aemu/base/threads/AndroidFunctorThread.cpp aemu/base/threads/AndroidThreadStore.cpp aemu/base/threads/AndroidThread_pthread.cpp aemu/base/threads/AndroidWorkPool.cpp aemu/base/AndroidHealthMonitor.cpp aemu/base/AndroidHealthMonitorConsumerBasic.cpp aemu/base/Tracing.cpp android/utils/debug.c)
android_add_library(TARGET androidemu SHARED LICENSE Apache-2.0 SRC aemu/base/AlignedBuf.cpp aemu/base/files/MemStream.cpp aemu/base/files/Stream.cpp aemu/base/files/StreamSerializing.cpp aemu/base/Pool.cpp aemu/base/StringFormat.cpp aemu/base/Process.cpp aemu/base/AndroidSubAllocator.cpp aemu/base/synchronization/AndroidMessageChannel.cpp aemu/base/threads/AndroidFunctorThread.cpp aemu/base/threads/AndroidThreadStore.cpp aemu/base/threads/AndroidThread_pthread.cpp aemu/base/threads/AndroidWorkPool.cpp aemu/base/AndroidHealthMonitor.cpp aemu/base/AndroidHealthMonitorConsumerBasic.cpp aemu/base/Tracing.cpp android/utils/debug.c)
-target_include_directories(androidemu PRIVATE ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(androidemu PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(androidemu PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR" "-DLOG_TAG=\"androidemu\"")
target_compile_options(androidemu PRIVATE "-fvisibility=default" "-Wno-unused-parameter" "-Wno-missing-field-initializers" "-fstrict-aliasing")
target_link_libraries(androidemu PRIVATE cutils utils log android-emu-shared)
# This is an autogenerated file! Do not edit!
# instead run make from .../device/generic/goldfish-opengl
# which will re-generate this file.
-android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/android-emu/Android.mk" "db8796ed60d925c8940c3ad8b125c0f8e8e6731f67d165040a6d478a8b894a0d")
+android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu/Android.mk" "db8796ed60d925c8940c3ad8b125c0f8e8e6731f67d165040a6d478a8b894a0d")
set(ringbuffer_src aemu/base/ring_buffer.c)
android_add_library(TARGET ringbuffer LICENSE Apache-2.0 SRC aemu/base/ring_buffer.c)
-target_include_directories(ringbuffer PRIVATE ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(ringbuffer PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(ringbuffer PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR")
target_compile_options(ringbuffer PRIVATE "-fvisibility=default" "-Wno-unused-parameter")
target_link_libraries(ringbuffer PRIVATE cutils utils log android-emu-shared)
\ No newline at end of file
diff --git a/guest/egl/CMakeLists.txt b/guest/egl/CMakeLists.txt
index 98bc1c1..4e930a2 100644
--- a/guest/egl/CMakeLists.txt
+++ b/guest/egl/CMakeLists.txt
@@ -4,7 +4,7 @@
android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/egl/Android.mk" "d7a50905a3d2624cf594158d9c370bf29bc6115d967bdfa919e9ffa42a87d0bb")
set(EGL_emulation_src eglDisplay.cpp egl.cpp ClientAPIExts.cpp)
android_add_library(TARGET EGL_emulation SHARED LICENSE Apache-2.0 SRC eglDisplay.cpp egl.cpp ClientAPIExts.cpp)
-target_include_directories(EGL_emulation PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/profiler ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon/bionic-include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon ${GOLDFISH_DEVICE_ROOT}/bionic/libc/private ${GOLDFISH_DEVICE_ROOT}/bionic/libc/platform ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/shared/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/shared/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(EGL_emulation PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/profiler ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon/bionic-include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon ${GOLDFISH_DEVICE_ROOT}/bionic/libc/private ${GOLDFISH_DEVICE_ROOT}/bionic/libc/platform ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(EGL_emulation PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR" "-DLOG_TAG=\"EGL_emulation\"" "-DEGL_EGLEXT_PROTOTYPES" "-DWITH_GLES2")
target_compile_options(EGL_emulation PRIVATE "-fvisibility=default" "-Wno-unused-parameter" "-Wno-gnu-designator")
target_link_libraries(EGL_emulation PRIVATE GoldfishProfiler OpenglSystemCommon android-emu-shared vulkan_enc gui log _renderControl_enc GLESv2_enc GLESv1_enc OpenglCodecCommon_host cutils utils androidemu PRIVATE gralloc_cb_host GoldfishAddressSpace_host platform_host qemupipe_host)
\ No newline at end of file
diff --git a/guest/gralloc_cb/CMakeLists.txt b/guest/gralloc_cb/CMakeLists.txt
index 35afb38..4445fb5 100644
--- a/guest/gralloc_cb/CMakeLists.txt
+++ b/guest/gralloc_cb/CMakeLists.txt
@@ -1,10 +1,10 @@
# This is an autogenerated file! Do not edit!
# instead run make from .../device/generic/goldfish-opengl
# which will re-generate this file.
-android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/shared/gralloc_cb/Android.mk" "8d9adf5ce35036abff985952ba984a3fcefcc2156ff36facfe51ba7d7adaab9d")
+android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/gralloc_cb/Android.mk" "8d9adf5ce35036abff985952ba984a3fcefcc2156ff36facfe51ba7d7adaab9d")
set(gralloc_cb_host_src empty.cpp)
android_add_library(TARGET gralloc_cb_host LICENSE Apache-2.0 SRC empty.cpp)
-target_include_directories(gralloc_cb_host PRIVATE ${GOLDFISH_DEVICE_ROOT}/shared/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(gralloc_cb_host PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(gralloc_cb_host PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR")
target_compile_options(gralloc_cb_host PRIVATE "-fvisibility=default" "-Wno-unused-parameter")
target_link_libraries(gralloc_cb_host PRIVATE android-emu-shared)
\ No newline at end of file
diff --git a/guest/platform/CMakeLists.txt b/guest/platform/CMakeLists.txt
index 2d25d30..e777321 100644
--- a/guest/platform/CMakeLists.txt
+++ b/guest/platform/CMakeLists.txt
@@ -4,7 +4,7 @@
android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/Android.mk" "b2e96eaf4c7c9823b6d1846beb672c82f82465e1122b699cc91192837f93782b")
set(platform_host_src stub/VirtGpuBlob.cpp stub/VirtGpuBlobMapping.cpp stub/VirtGpuDevice.cpp)
android_add_library(TARGET platform_host LICENSE Apache-2.0 SRC stub/VirtGpuBlob.cpp stub/VirtGpuBlobMapping.cpp stub/VirtGpuDevice.cpp)
-target_include_directories(platform_host PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(platform_host PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(platform_host PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR")
target_compile_options(platform_host PRIVATE "-fvisibility=default" "-Wno-unused-parameter")
target_link_libraries(platform_host PRIVATE log android-emu-shared)
\ No newline at end of file
diff --git a/guest/profiler/CMakeLists.txt b/guest/profiler/CMakeLists.txt
index 8f37abe..83de71c 100644
--- a/guest/profiler/CMakeLists.txt
+++ b/guest/profiler/CMakeLists.txt
@@ -4,7 +4,7 @@
android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/profiler/Android.mk" "bbad89e505575aa9b7fe672e89c3bb581310a931cdb4849415b7085141dce536")
set(GoldfishProfiler_src profiler_stub.cpp)
android_add_library(TARGET GoldfishProfiler SHARED LICENSE Apache-2.0 SRC profiler_stub.cpp)
-target_include_directories(GoldfishProfiler PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/profiler ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(GoldfishProfiler PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/profiler ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(GoldfishProfiler PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR")
target_compile_options(GoldfishProfiler PRIVATE "-fvisibility=default" "-Wno-unused-parameter")
target_link_libraries(GoldfishProfiler PRIVATE android-emu-shared vulkan_enc gui log _renderControl_enc GLESv2_enc GLESv1_enc OpenglCodecCommon_host cutils utils androidemu PRIVATE gralloc_cb_host GoldfishAddressSpace_host platform_host qemupipe_host)
\ No newline at end of file
diff --git a/guest/qemupipe/CMakeLists.txt b/guest/qemupipe/CMakeLists.txt
index bfa5140..dc907ef 100644
--- a/guest/qemupipe/CMakeLists.txt
+++ b/guest/qemupipe/CMakeLists.txt
@@ -1,10 +1,10 @@
# This is an autogenerated file! Do not edit!
# instead run make from .../device/generic/goldfish-opengl
# which will re-generate this file.
-android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/Android.mk" "8554a162304f69cc357d5e35cf614ca278135bf4cea3431da69a08b9af234777")
+android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/Android.mk" "8554a162304f69cc357d5e35cf614ca278135bf4cea3431da69a08b9af234777")
set(qemupipe_host_src qemu_pipe_common.cpp qemu_pipe_host.cpp)
android_add_library(TARGET qemupipe_host LICENSE Apache-2.0 SRC qemu_pipe_common.cpp qemu_pipe_host.cpp)
-target_include_directories(qemupipe_host PRIVATE ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(qemupipe_host PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(qemupipe_host PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR")
target_compile_options(qemupipe_host PRIVATE "-fvisibility=default" "-Wno-unused-parameter")
target_link_libraries(qemupipe_host PRIVATE android-emu-shared)
\ No newline at end of file
diff --git a/guest/renderControl_enc/CMakeLists.txt b/guest/renderControl_enc/CMakeLists.txt
index 12de9fd..7fe96e2 100644
--- a/guest/renderControl_enc/CMakeLists.txt
+++ b/guest/renderControl_enc/CMakeLists.txt
@@ -4,7 +4,7 @@
android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc/Android.mk" "780a007ac7a3d2255372ddf40e03aeb10e4c759343d2532f6ddf769f4df73810")
set(_renderControl_enc_src renderControl_client_context.cpp renderControl_enc.cpp renderControl_entry.cpp)
android_add_library(TARGET _renderControl_enc SHARED LICENSE Apache-2.0 SRC renderControl_client_context.cpp renderControl_enc.cpp renderControl_entry.cpp)
-target_include_directories(_renderControl_enc PRIVATE ${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
+target_include_directories(_renderControl_enc PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest)
target_compile_definitions(_renderControl_enc PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR")
target_compile_options(_renderControl_enc PRIVATE "-fvisibility=default" "-Wno-unused-parameter" "-Wno-unused-function")
target_link_libraries(_renderControl_enc PRIVATE OpenglCodecCommon_host cutils utils log androidemu android-emu-shared PRIVATE qemupipe_host)
\ No newline at end of file
diff --git a/guest/vulkan/CMakeLists.txt b/guest/vulkan/CMakeLists.txt
index d4f55da..754877f 100644
--- a/guest/vulkan/CMakeLists.txt
+++ b/guest/vulkan/CMakeLists.txt
@@ -4,7 +4,7 @@
android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan/Android.mk" "d47f26efbed96a8b196d53227d614e03c1275f3551edb93f1828a95c2d816377")
set(vulkan.ranchu_src goldfish_vulkan.cpp)
android_add_library(TARGET vulkan.ranchu SHARED LICENSE Apache-2.0 SRC goldfish_vulkan.cpp)
-target_include_directories(vulkan.ranchu PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon/bionic-include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon ${GOLDFISH_DEVICE_ROOT}/bionic/libc/private ${GOLDFISH_DEVICE_ROOT}/bionic/libc/platform ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/shared/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/shared/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/common/vulkan/include)
+target_include_directories(vulkan.ranchu PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon/bionic-include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglSystemCommon ${GOLDFISH_DEVICE_ROOT}/bionic/libc/private ${GOLDFISH_DEVICE_ROOT}/bionic/libc/platform ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/gralloc_cb/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/common/vulkan/include)
target_compile_definitions(vulkan.ranchu PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR" "-DLOG_TAG=\"goldfish_vulkan\"" "-DVK_USE_PLATFORM_ANDROID_KHR" "-DVK_NO_PROTOTYPES")
target_compile_options(vulkan.ranchu PRIVATE "-fvisibility=default" "-Wno-unused-parameter" "-Wno-missing-field-initializers" "-fvisibility=hidden" "-fstrict-aliasing" "-Wno-unused-function")
target_link_libraries(vulkan.ranchu PRIVATE OpenglSystemCommon android-emu-shared vulkan_enc gui log _renderControl_enc GLESv2_enc GLESv1_enc OpenglCodecCommon_host cutils utils androidemu GoldfishProfiler PRIVATE gralloc_cb_host GoldfishAddressSpace_host platform_host qemupipe_host)
\ No newline at end of file
diff --git a/guest/vulkan_enc/CMakeLists.txt b/guest/vulkan_enc/CMakeLists.txt
index 05612e2..f39eb7c 100644
--- a/guest/vulkan_enc/CMakeLists.txt
+++ b/guest/vulkan_enc/CMakeLists.txt
@@ -4,7 +4,7 @@
android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc/Android.mk" "2ab222e87ce06154ed187f117de965f14403e97cedfff7ca47391ad183ba705f")
set(vulkan_enc_src AndroidHardwareBuffer.cpp CommandBufferStagingStream.cpp DescriptorSetVirtualization.cpp HostVisibleMemoryVirtualization.cpp Resources.cpp Validation.cpp VulkanStreamGuest.cpp VulkanHandleMapping.cpp ResourceTracker.cpp VkEncoder.cpp goldfish_vk_extension_structs_guest.cpp goldfish_vk_marshaling_guest.cpp goldfish_vk_reserved_marshaling_guest.cpp goldfish_vk_deepcopy_guest.cpp goldfish_vk_counting_guest.cpp goldfish_vk_handlemap_guest.cpp goldfish_vk_transform_guest.cpp func_table.cpp)
android_add_library(TARGET vulkan_enc SHARED LICENSE Apache-2.0 SRC AndroidHardwareBuffer.cpp CommandBufferStagingStream.cpp DescriptorSetVirtualization.cpp HostVisibleMemoryVirtualization.cpp Resources.cpp Validation.cpp VulkanStreamGuest.cpp VulkanHandleMapping.cpp ResourceTracker.cpp VkEncoder.cpp goldfish_vk_extension_structs_guest.cpp goldfish_vk_marshaling_guest.cpp goldfish_vk_reserved_marshaling_guest.cpp goldfish_vk_deepcopy_guest.cpp goldfish_vk_counting_guest.cpp goldfish_vk_handlemap_guest.cpp goldfish_vk_transform_guest.cpp func_table.cpp)
-target_include_directories(vulkan_enc PRIVATE ${GOLDFISH_DEVICE_ROOT}/shared/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/shared/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/common/vulkan/include)
+target_include_directories(vulkan_enc PRIVATE ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/platform/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/android-emu ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include-types ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/qemupipe/include ${GOLDFISH_DEVICE_ROOT}/../../../hardware/google/gfxstream/guest/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/iostream/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/guest/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest ${GOLDFISH_DEVICE_ROOT}/./../../../hardware/google/gfxstream/common/vulkan/include)
target_compile_definitions(vulkan_enc PRIVATE "-DPLATFORM_SDK_VERSION=29" "-DGOLDFISH_HIDL_GRALLOC" "-DHOST_BUILD" "-DANDROID" "-DGL_GLEXT_PROTOTYPES" "-DPAGE_SIZE=4096" "-DGFXSTREAM" "-DENABLE_ANDROID_HEALTH_MONITOR" "-DLOG_TAG=\"goldfish_vulkan\"" "-DVK_ANDROID_native_buffer" "-DVK_EXT_device_memory_report" "-DVK_GOOGLE_gfxstream" "-DVK_USE_PLATFORM_ANDROID_KHR" "-DVK_NO_PROTOTYPES" "-DVIRTIO_GPU" "-D__ANDROID_API__=28")
target_compile_options(vulkan_enc PRIVATE "-fvisibility=default" "-Wno-unused-parameter" "-Wno-missing-field-initializers" "-Werror" "-fstrict-aliasing")
target_link_libraries(vulkan_enc PRIVATE gui log android-emu-shared _renderControl_enc OpenglCodecCommon_host cutils utils androidemu PRIVATE GoldfishAddressSpace_host platform_host qemupipe_host)
\ No newline at end of file
