commit | b061d51f095ad793d1fe9bdddb16b028d0b8d47d | [log] [tgz] |
---|---|---|
author | Jason Macnak <[email protected]> | Thu Jun 01 11:05:44 2023 -0700 |
committer | Jason Macnak <[email protected]> | Thu Jun 01 11:05:44 2023 -0700 |
tree | 6b56232a794387504ad39702e80b5e00258da709 | |
parent | 4e91f55ce363f55ecfcfd321f1f19765516cb39a [diff] |
Rename imported system directory to guest Bug: b/271464937 Test: presubmit Change-Id: Ib5a083110e53ef533df9c441efe241fce123217f
diff --git a/system/GLESv1/Android.mk b/guest/GLESv1/Android.mk similarity index 100% rename from system/GLESv1/Android.mk rename to guest/GLESv1/Android.mk
diff --git a/system/GLESv1/CMakeLists.txt b/guest/GLESv1/CMakeLists.txt similarity index 100% rename from system/GLESv1/CMakeLists.txt rename to guest/GLESv1/CMakeLists.txt
diff --git a/system/GLESv1/gl.cpp b/guest/GLESv1/gl.cpp similarity index 100% rename from system/GLESv1/gl.cpp rename to guest/GLESv1/gl.cpp
diff --git a/system/GLESv1_enc/Android.mk b/guest/GLESv1_enc/Android.mk similarity index 100% rename from system/GLESv1_enc/Android.mk rename to guest/GLESv1_enc/Android.mk
diff --git a/system/GLESv1_enc/CMakeLists.txt b/guest/GLESv1_enc/CMakeLists.txt similarity index 100% rename from system/GLESv1_enc/CMakeLists.txt rename to guest/GLESv1_enc/CMakeLists.txt
diff --git a/system/GLESv1_enc/GLEncoder.cpp b/guest/GLESv1_enc/GLEncoder.cpp similarity index 100% rename from system/GLESv1_enc/GLEncoder.cpp rename to guest/GLESv1_enc/GLEncoder.cpp
diff --git a/system/GLESv1_enc/GLEncoder.h b/guest/GLESv1_enc/GLEncoder.h similarity index 100% rename from system/GLESv1_enc/GLEncoder.h rename to guest/GLESv1_enc/GLEncoder.h
diff --git a/system/GLESv1_enc/GLEncoderUtils.cpp b/guest/GLESv1_enc/GLEncoderUtils.cpp similarity index 100% rename from system/GLESv1_enc/GLEncoderUtils.cpp rename to guest/GLESv1_enc/GLEncoderUtils.cpp
diff --git a/system/GLESv1_enc/GLEncoderUtils.h b/guest/GLESv1_enc/GLEncoderUtils.h similarity index 100% rename from system/GLESv1_enc/GLEncoderUtils.h rename to guest/GLESv1_enc/GLEncoderUtils.h
diff --git a/system/GLESv1_enc/gl_client_context.cpp b/guest/GLESv1_enc/gl_client_context.cpp similarity index 100% rename from system/GLESv1_enc/gl_client_context.cpp rename to guest/GLESv1_enc/gl_client_context.cpp
diff --git a/system/GLESv1_enc/gl_client_context.h b/guest/GLESv1_enc/gl_client_context.h similarity index 100% rename from system/GLESv1_enc/gl_client_context.h rename to guest/GLESv1_enc/gl_client_context.h
diff --git a/system/GLESv1_enc/gl_client_proc.h b/guest/GLESv1_enc/gl_client_proc.h similarity index 100% rename from system/GLESv1_enc/gl_client_proc.h rename to guest/GLESv1_enc/gl_client_proc.h
diff --git a/system/GLESv1_enc/gl_enc.cpp b/guest/GLESv1_enc/gl_enc.cpp similarity index 100% rename from system/GLESv1_enc/gl_enc.cpp rename to guest/GLESv1_enc/gl_enc.cpp
diff --git a/system/GLESv1_enc/gl_enc.h b/guest/GLESv1_enc/gl_enc.h similarity index 100% rename from system/GLESv1_enc/gl_enc.h rename to guest/GLESv1_enc/gl_enc.h
diff --git a/system/GLESv1_enc/gl_entry.cpp b/guest/GLESv1_enc/gl_entry.cpp similarity index 100% rename from system/GLESv1_enc/gl_entry.cpp rename to guest/GLESv1_enc/gl_entry.cpp
diff --git a/system/GLESv1_enc/gl_ftable.h b/guest/GLESv1_enc/gl_ftable.h similarity index 100% rename from system/GLESv1_enc/gl_ftable.h rename to guest/GLESv1_enc/gl_ftable.h
diff --git a/system/GLESv1_enc/gl_opcodes.h b/guest/GLESv1_enc/gl_opcodes.h similarity index 100% rename from system/GLESv1_enc/gl_opcodes.h rename to guest/GLESv1_enc/gl_opcodes.h
diff --git a/system/GLESv1_enc/gl_types.h b/guest/GLESv1_enc/gl_types.h similarity index 100% rename from system/GLESv1_enc/gl_types.h rename to guest/GLESv1_enc/gl_types.h
diff --git a/system/GLESv2/Android.mk b/guest/GLESv2/Android.mk similarity index 100% rename from system/GLESv2/Android.mk rename to guest/GLESv2/Android.mk
diff --git a/system/GLESv2/CMakeLists.txt b/guest/GLESv2/CMakeLists.txt similarity index 100% rename from system/GLESv2/CMakeLists.txt rename to guest/GLESv2/CMakeLists.txt
diff --git a/system/GLESv2/gl2.cpp b/guest/GLESv2/gl2.cpp similarity index 100% rename from system/GLESv2/gl2.cpp rename to guest/GLESv2/gl2.cpp
diff --git a/system/GLESv2_enc/Android.mk b/guest/GLESv2_enc/Android.mk similarity index 100% rename from system/GLESv2_enc/Android.mk rename to guest/GLESv2_enc/Android.mk
diff --git a/system/GLESv2_enc/CMakeLists.txt b/guest/GLESv2_enc/CMakeLists.txt similarity index 100% rename from system/GLESv2_enc/CMakeLists.txt rename to guest/GLESv2_enc/CMakeLists.txt
diff --git a/system/GLESv2_enc/GL2Encoder.cpp b/guest/GLESv2_enc/GL2Encoder.cpp similarity index 100% rename from system/GLESv2_enc/GL2Encoder.cpp rename to guest/GLESv2_enc/GL2Encoder.cpp
diff --git a/system/GLESv2_enc/GL2Encoder.h b/guest/GLESv2_enc/GL2Encoder.h similarity index 100% rename from system/GLESv2_enc/GL2Encoder.h rename to guest/GLESv2_enc/GL2Encoder.h
diff --git a/system/GLESv2_enc/GL2EncoderUtils.cpp b/guest/GLESv2_enc/GL2EncoderUtils.cpp similarity index 100% rename from system/GLESv2_enc/GL2EncoderUtils.cpp rename to guest/GLESv2_enc/GL2EncoderUtils.cpp
diff --git a/system/GLESv2_enc/GL2EncoderUtils.h b/guest/GLESv2_enc/GL2EncoderUtils.h similarity index 100% rename from system/GLESv2_enc/GL2EncoderUtils.h rename to guest/GLESv2_enc/GL2EncoderUtils.h
diff --git a/system/GLESv2_enc/GLESv2Validation.cpp b/guest/GLESv2_enc/GLESv2Validation.cpp similarity index 100% rename from system/GLESv2_enc/GLESv2Validation.cpp rename to guest/GLESv2_enc/GLESv2Validation.cpp
diff --git a/system/GLESv2_enc/GLESv2Validation.h b/guest/GLESv2_enc/GLESv2Validation.h similarity index 100% rename from system/GLESv2_enc/GLESv2Validation.h rename to guest/GLESv2_enc/GLESv2Validation.h
diff --git a/system/GLESv2_enc/IOStream2.cpp b/guest/GLESv2_enc/IOStream2.cpp similarity index 100% rename from system/GLESv2_enc/IOStream2.cpp rename to guest/GLESv2_enc/IOStream2.cpp
diff --git a/system/GLESv2_enc/gl2_client_context.cpp b/guest/GLESv2_enc/gl2_client_context.cpp similarity index 100% rename from system/GLESv2_enc/gl2_client_context.cpp rename to guest/GLESv2_enc/gl2_client_context.cpp
diff --git a/system/GLESv2_enc/gl2_client_context.h b/guest/GLESv2_enc/gl2_client_context.h similarity index 100% rename from system/GLESv2_enc/gl2_client_context.h rename to guest/GLESv2_enc/gl2_client_context.h
diff --git a/system/GLESv2_enc/gl2_client_proc.h b/guest/GLESv2_enc/gl2_client_proc.h similarity index 100% rename from system/GLESv2_enc/gl2_client_proc.h rename to guest/GLESv2_enc/gl2_client_proc.h
diff --git a/system/GLESv2_enc/gl2_enc.cpp b/guest/GLESv2_enc/gl2_enc.cpp similarity index 100% rename from system/GLESv2_enc/gl2_enc.cpp rename to guest/GLESv2_enc/gl2_enc.cpp
diff --git a/system/GLESv2_enc/gl2_enc.h b/guest/GLESv2_enc/gl2_enc.h similarity index 100% rename from system/GLESv2_enc/gl2_enc.h rename to guest/GLESv2_enc/gl2_enc.h
diff --git a/system/GLESv2_enc/gl2_entry.cpp b/guest/GLESv2_enc/gl2_entry.cpp similarity index 100% rename from system/GLESv2_enc/gl2_entry.cpp rename to guest/GLESv2_enc/gl2_entry.cpp
diff --git a/system/GLESv2_enc/gl2_ftable.h b/guest/GLESv2_enc/gl2_ftable.h similarity index 100% rename from system/GLESv2_enc/gl2_ftable.h rename to guest/GLESv2_enc/gl2_ftable.h
diff --git a/system/GLESv2_enc/gl2_opcodes.h b/guest/GLESv2_enc/gl2_opcodes.h similarity index 100% rename from system/GLESv2_enc/gl2_opcodes.h rename to guest/GLESv2_enc/gl2_opcodes.h
diff --git a/system/GLESv2_enc/gl2_types.h b/guest/GLESv2_enc/gl2_types.h similarity index 100% rename from system/GLESv2_enc/gl2_types.h rename to guest/GLESv2_enc/gl2_types.h
diff --git a/system/OpenglSystemCommon/AddressSpaceStream.cpp b/guest/OpenglSystemCommon/AddressSpaceStream.cpp similarity index 100% rename from system/OpenglSystemCommon/AddressSpaceStream.cpp rename to guest/OpenglSystemCommon/AddressSpaceStream.cpp
diff --git a/system/OpenglSystemCommon/AddressSpaceStream.h b/guest/OpenglSystemCommon/AddressSpaceStream.h similarity index 100% rename from system/OpenglSystemCommon/AddressSpaceStream.h rename to guest/OpenglSystemCommon/AddressSpaceStream.h
diff --git a/system/OpenglSystemCommon/Android.mk b/guest/OpenglSystemCommon/Android.mk similarity index 100% rename from system/OpenglSystemCommon/Android.mk rename to guest/OpenglSystemCommon/Android.mk
diff --git a/system/OpenglSystemCommon/CMakeLists.txt b/guest/OpenglSystemCommon/CMakeLists.txt similarity index 100% rename from system/OpenglSystemCommon/CMakeLists.txt rename to guest/OpenglSystemCommon/CMakeLists.txt
diff --git a/system/OpenglSystemCommon/EGLClientIface.h b/guest/OpenglSystemCommon/EGLClientIface.h similarity index 100% rename from system/OpenglSystemCommon/EGLClientIface.h rename to guest/OpenglSystemCommon/EGLClientIface.h
diff --git a/system/OpenglSystemCommon/EGLImage.h b/guest/OpenglSystemCommon/EGLImage.h similarity index 100% rename from system/OpenglSystemCommon/EGLImage.h rename to guest/OpenglSystemCommon/EGLImage.h
diff --git a/system/OpenglSystemCommon/EmulatorFeatureInfo.h b/guest/OpenglSystemCommon/EmulatorFeatureInfo.h similarity index 100% rename from system/OpenglSystemCommon/EmulatorFeatureInfo.h rename to guest/OpenglSystemCommon/EmulatorFeatureInfo.h
diff --git a/system/OpenglSystemCommon/FormatConversions.cpp b/guest/OpenglSystemCommon/FormatConversions.cpp similarity index 100% rename from system/OpenglSystemCommon/FormatConversions.cpp rename to guest/OpenglSystemCommon/FormatConversions.cpp
diff --git a/system/OpenglSystemCommon/FormatConversions.h b/guest/OpenglSystemCommon/FormatConversions.h similarity index 100% rename from system/OpenglSystemCommon/FormatConversions.h rename to guest/OpenglSystemCommon/FormatConversions.h
diff --git a/system/OpenglSystemCommon/HostConnection.cpp b/guest/OpenglSystemCommon/HostConnection.cpp similarity index 100% rename from system/OpenglSystemCommon/HostConnection.cpp rename to guest/OpenglSystemCommon/HostConnection.cpp
diff --git a/system/OpenglSystemCommon/HostConnection.h b/guest/OpenglSystemCommon/HostConnection.h similarity index 100% rename from system/OpenglSystemCommon/HostConnection.h rename to guest/OpenglSystemCommon/HostConnection.h
diff --git a/system/OpenglSystemCommon/ProcessPipe.cpp b/guest/OpenglSystemCommon/ProcessPipe.cpp similarity index 100% rename from system/OpenglSystemCommon/ProcessPipe.cpp rename to guest/OpenglSystemCommon/ProcessPipe.cpp
diff --git a/system/OpenglSystemCommon/ProcessPipe.h b/guest/OpenglSystemCommon/ProcessPipe.h similarity index 100% rename from system/OpenglSystemCommon/ProcessPipe.h rename to guest/OpenglSystemCommon/ProcessPipe.h
diff --git a/system/OpenglSystemCommon/QemuPipeStream.cpp b/guest/OpenglSystemCommon/QemuPipeStream.cpp similarity index 100% rename from system/OpenglSystemCommon/QemuPipeStream.cpp rename to guest/OpenglSystemCommon/QemuPipeStream.cpp
diff --git a/system/OpenglSystemCommon/QemuPipeStream.h b/guest/OpenglSystemCommon/QemuPipeStream.h similarity index 100% rename from system/OpenglSystemCommon/QemuPipeStream.h rename to guest/OpenglSystemCommon/QemuPipeStream.h
diff --git a/system/OpenglSystemCommon/QemuPipeStreamFuchsia.cpp b/guest/OpenglSystemCommon/QemuPipeStreamFuchsia.cpp similarity index 100% rename from system/OpenglSystemCommon/QemuPipeStreamFuchsia.cpp rename to guest/OpenglSystemCommon/QemuPipeStreamFuchsia.cpp
diff --git a/system/OpenglSystemCommon/ThreadInfo.cpp b/guest/OpenglSystemCommon/ThreadInfo.cpp similarity index 100% rename from system/OpenglSystemCommon/ThreadInfo.cpp rename to guest/OpenglSystemCommon/ThreadInfo.cpp
diff --git a/system/OpenglSystemCommon/ThreadInfo.h b/guest/OpenglSystemCommon/ThreadInfo.h similarity index 100% rename from system/OpenglSystemCommon/ThreadInfo.h rename to guest/OpenglSystemCommon/ThreadInfo.h
diff --git a/system/OpenglSystemCommon/TraceProviderFuchsia.cpp b/guest/OpenglSystemCommon/TraceProviderFuchsia.cpp similarity index 100% rename from system/OpenglSystemCommon/TraceProviderFuchsia.cpp rename to guest/OpenglSystemCommon/TraceProviderFuchsia.cpp
diff --git a/system/OpenglSystemCommon/TraceProviderFuchsia.h b/guest/OpenglSystemCommon/TraceProviderFuchsia.h similarity index 100% rename from system/OpenglSystemCommon/TraceProviderFuchsia.h rename to guest/OpenglSystemCommon/TraceProviderFuchsia.h
diff --git a/system/OpenglSystemCommon/VirtioGpuPipeStream.cpp b/guest/OpenglSystemCommon/VirtioGpuPipeStream.cpp similarity index 100% rename from system/OpenglSystemCommon/VirtioGpuPipeStream.cpp rename to guest/OpenglSystemCommon/VirtioGpuPipeStream.cpp
diff --git a/system/OpenglSystemCommon/VirtioGpuPipeStream.h b/guest/OpenglSystemCommon/VirtioGpuPipeStream.h similarity index 100% rename from system/OpenglSystemCommon/VirtioGpuPipeStream.h rename to guest/OpenglSystemCommon/VirtioGpuPipeStream.h
diff --git a/system/OpenglSystemCommon/address_space_graphics_types.h b/guest/OpenglSystemCommon/address_space_graphics_types.h similarity index 100% rename from system/OpenglSystemCommon/address_space_graphics_types.h rename to guest/OpenglSystemCommon/address_space_graphics_types.h
diff --git a/system/OpenglSystemCommon/bionic-include/bionic/tls.h b/guest/OpenglSystemCommon/bionic-include/bionic/tls.h similarity index 100% rename from system/OpenglSystemCommon/bionic-include/bionic/tls.h rename to guest/OpenglSystemCommon/bionic-include/bionic/tls.h
diff --git a/system/OpenglSystemCommon/meson.build b/guest/OpenglSystemCommon/meson.build similarity index 100% rename from system/OpenglSystemCommon/meson.build rename to guest/OpenglSystemCommon/meson.build
diff --git a/system/egl/Android.mk b/guest/egl/Android.mk similarity index 100% rename from system/egl/Android.mk rename to guest/egl/Android.mk
diff --git a/system/egl/CMakeLists.txt b/guest/egl/CMakeLists.txt similarity index 100% rename from system/egl/CMakeLists.txt rename to guest/egl/CMakeLists.txt
diff --git a/system/egl/ClientAPIExts.cpp b/guest/egl/ClientAPIExts.cpp similarity index 100% rename from system/egl/ClientAPIExts.cpp rename to guest/egl/ClientAPIExts.cpp
diff --git a/system/egl/ClientAPIExts.h b/guest/egl/ClientAPIExts.h similarity index 100% rename from system/egl/ClientAPIExts.h rename to guest/egl/ClientAPIExts.h
diff --git a/system/egl/ClientAPIExts.in b/guest/egl/ClientAPIExts.in similarity index 100% rename from system/egl/ClientAPIExts.in rename to guest/egl/ClientAPIExts.in
diff --git a/system/egl/egl.cfg b/guest/egl/egl.cfg similarity index 100% rename from system/egl/egl.cfg rename to guest/egl/egl.cfg
diff --git a/system/egl/egl.cpp b/guest/egl/egl.cpp similarity index 100% rename from system/egl/egl.cpp rename to guest/egl/egl.cpp
diff --git a/system/egl/eglContext.h b/guest/egl/eglContext.h similarity index 100% rename from system/egl/eglContext.h rename to guest/egl/eglContext.h
diff --git a/system/egl/eglDisplay.cpp b/guest/egl/eglDisplay.cpp similarity index 100% rename from system/egl/eglDisplay.cpp rename to guest/egl/eglDisplay.cpp
diff --git a/system/egl/eglDisplay.h b/guest/egl/eglDisplay.h similarity index 100% rename from system/egl/eglDisplay.h rename to guest/egl/eglDisplay.h
diff --git a/system/egl/eglSync.h b/guest/egl/eglSync.h similarity index 100% rename from system/egl/eglSync.h rename to guest/egl/eglSync.h
diff --git a/system/egl/egl_ftable.h b/guest/egl/egl_ftable.h similarity index 100% rename from system/egl/egl_ftable.h rename to guest/egl/egl_ftable.h
diff --git a/system/egl/goldfish_sync.h b/guest/egl/goldfish_sync.h similarity index 100% rename from system/egl/goldfish_sync.h rename to guest/egl/goldfish_sync.h
diff --git a/system/include/EGL/egl.h b/guest/include/EGL/egl.h similarity index 100% rename from system/include/EGL/egl.h rename to guest/include/EGL/egl.h
diff --git a/system/include/EGL/eglext.h b/guest/include/EGL/eglext.h similarity index 100% rename from system/include/EGL/eglext.h rename to guest/include/EGL/eglext.h
diff --git a/system/include/EGL/eglplatform.h b/guest/include/EGL/eglplatform.h similarity index 100% rename from system/include/EGL/eglplatform.h rename to guest/include/EGL/eglplatform.h
diff --git a/system/include/ETC1/etc1.h b/guest/include/ETC1/etc1.h similarity index 100% rename from system/include/ETC1/etc1.h rename to guest/include/ETC1/etc1.h
diff --git a/system/include/GLES/egl.h b/guest/include/GLES/egl.h similarity index 100% rename from system/include/GLES/egl.h rename to guest/include/GLES/egl.h
diff --git a/system/include/GLES/gl.h b/guest/include/GLES/gl.h similarity index 100% rename from system/include/GLES/gl.h rename to guest/include/GLES/gl.h
diff --git a/system/include/GLES/glext.h b/guest/include/GLES/glext.h similarity index 100% rename from system/include/GLES/glext.h rename to guest/include/GLES/glext.h
diff --git a/system/include/GLES/glplatform.h b/guest/include/GLES/glplatform.h similarity index 100% rename from system/include/GLES/glplatform.h rename to guest/include/GLES/glplatform.h
diff --git a/system/include/GLES2/gl2.h b/guest/include/GLES2/gl2.h similarity index 100% rename from system/include/GLES2/gl2.h rename to guest/include/GLES2/gl2.h
diff --git a/system/include/GLES2/gl2ext.h b/guest/include/GLES2/gl2ext.h similarity index 100% rename from system/include/GLES2/gl2ext.h rename to guest/include/GLES2/gl2ext.h
diff --git a/system/include/GLES2/gl2platform.h b/guest/include/GLES2/gl2platform.h similarity index 100% rename from system/include/GLES2/gl2platform.h rename to guest/include/GLES2/gl2platform.h
diff --git a/system/include/GLES3/gl3.h b/guest/include/GLES3/gl3.h similarity index 100% rename from system/include/GLES3/gl3.h rename to guest/include/GLES3/gl3.h
diff --git a/system/include/GLES3/gl31.h b/guest/include/GLES3/gl31.h similarity index 100% rename from system/include/GLES3/gl31.h rename to guest/include/GLES3/gl31.h
diff --git a/system/include/GLES3/gl3ext.h b/guest/include/GLES3/gl3ext.h similarity index 100% rename from system/include/GLES3/gl3ext.h rename to guest/include/GLES3/gl3ext.h
diff --git a/system/include/GLES3/gl3platform.h b/guest/include/GLES3/gl3platform.h similarity index 100% rename from system/include/GLES3/gl3platform.h rename to guest/include/GLES3/gl3platform.h
diff --git a/system/include/KHR/khrplatform.h b/guest/include/KHR/khrplatform.h similarity index 100% rename from system/include/KHR/khrplatform.h rename to guest/include/KHR/khrplatform.h
diff --git a/system/include/MODULE_LICENSE_MIT b/guest/include/MODULE_LICENSE_MIT similarity index 100% rename from system/include/MODULE_LICENSE_MIT rename to guest/include/MODULE_LICENSE_MIT
diff --git a/system/include/virtgpu_drm.h b/guest/include/virtgpu_drm.h similarity index 100% rename from system/include/virtgpu_drm.h rename to guest/include/virtgpu_drm.h
diff --git a/system/magma/magma.cpp b/guest/magma/magma.cpp similarity index 100% rename from system/magma/magma.cpp rename to guest/magma/magma.cpp
diff --git a/system/magma/magma_enc/magma_client_context.cpp b/guest/magma/magma_enc/magma_client_context.cpp similarity index 100% rename from system/magma/magma_enc/magma_client_context.cpp rename to guest/magma/magma_enc/magma_client_context.cpp
diff --git a/system/magma/magma_enc/magma_client_context.h b/guest/magma/magma_enc/magma_client_context.h similarity index 100% rename from system/magma/magma_enc/magma_client_context.h rename to guest/magma/magma_enc/magma_client_context.h
diff --git a/system/magma/magma_enc/magma_client_proc.h b/guest/magma/magma_enc/magma_client_proc.h similarity index 100% rename from system/magma/magma_enc/magma_client_proc.h rename to guest/magma/magma_enc/magma_client_proc.h
diff --git a/system/magma/magma_enc/magma_enc.cpp b/guest/magma/magma_enc/magma_enc.cpp similarity index 100% rename from system/magma/magma_enc/magma_enc.cpp rename to guest/magma/magma_enc/magma_enc.cpp
diff --git a/system/magma/magma_enc/magma_enc.h b/guest/magma/magma_enc/magma_enc.h similarity index 100% rename from system/magma/magma_enc/magma_enc.h rename to guest/magma/magma_enc/magma_enc.h
diff --git a/system/magma/magma_enc/magma_entry.cpp b/guest/magma/magma_enc/magma_entry.cpp similarity index 100% rename from system/magma/magma_enc/magma_entry.cpp rename to guest/magma/magma_enc/magma_entry.cpp
diff --git a/system/magma/magma_enc/magma_ftable.h b/guest/magma/magma_enc/magma_ftable.h similarity index 100% rename from system/magma/magma_enc/magma_ftable.h rename to guest/magma/magma_enc/magma_ftable.h
diff --git a/system/magma/magma_enc/magma_opcodes.h b/guest/magma/magma_enc/magma_opcodes.h similarity index 100% rename from system/magma/magma_enc/magma_opcodes.h rename to guest/magma/magma_enc/magma_opcodes.h
diff --git a/system/magma/magma_enc_util.cpp b/guest/magma/magma_enc_util.cpp similarity index 100% rename from system/magma/magma_enc_util.cpp rename to guest/magma/magma_enc_util.cpp
diff --git a/system/magma/magma_enc_util.h b/guest/magma/magma_enc_util.h similarity index 100% rename from system/magma/magma_enc_util.h rename to guest/magma/magma_enc_util.h
diff --git a/system/magma/magma_types.h b/guest/magma/magma_types.h similarity index 100% rename from system/magma/magma_types.h rename to guest/magma/magma_types.h
diff --git a/system/magma/meson.build b/guest/magma/meson.build similarity index 100% rename from system/magma/meson.build rename to guest/magma/meson.build
diff --git a/system/meson.build b/guest/meson.build similarity index 100% rename from system/meson.build rename to guest/meson.build
diff --git a/system/profiler/Android.mk b/guest/profiler/Android.mk similarity index 100% rename from system/profiler/Android.mk rename to guest/profiler/Android.mk
diff --git a/system/profiler/CMakeLists.txt b/guest/profiler/CMakeLists.txt similarity index 100% rename from system/profiler/CMakeLists.txt rename to guest/profiler/CMakeLists.txt
diff --git a/system/profiler/perfetto.cpp b/guest/profiler/perfetto.cpp similarity index 100% rename from system/profiler/perfetto.cpp rename to guest/profiler/perfetto.cpp
diff --git a/system/profiler/perfetto.h b/guest/profiler/perfetto.h similarity index 100% rename from system/profiler/perfetto.h rename to guest/profiler/perfetto.h
diff --git a/system/profiler/profiler.cpp b/guest/profiler/profiler.cpp similarity index 100% rename from system/profiler/profiler.cpp rename to guest/profiler/profiler.cpp
diff --git a/system/profiler/profiler.h b/guest/profiler/profiler.h similarity index 100% rename from system/profiler/profiler.h rename to guest/profiler/profiler.h
diff --git a/system/profiler/profiler_stub.cpp b/guest/profiler/profiler_stub.cpp similarity index 100% rename from system/profiler/profiler_stub.cpp rename to guest/profiler/profiler_stub.cpp
diff --git a/system/renderControl_enc/Android.mk b/guest/renderControl_enc/Android.mk similarity index 100% rename from system/renderControl_enc/Android.mk rename to guest/renderControl_enc/Android.mk
diff --git a/system/renderControl_enc/CMakeLists.txt b/guest/renderControl_enc/CMakeLists.txt similarity index 100% rename from system/renderControl_enc/CMakeLists.txt rename to guest/renderControl_enc/CMakeLists.txt
diff --git a/system/renderControl_enc/README b/guest/renderControl_enc/README similarity index 100% rename from system/renderControl_enc/README rename to guest/renderControl_enc/README
diff --git a/system/renderControl_enc/meson.build b/guest/renderControl_enc/meson.build similarity index 100% rename from system/renderControl_enc/meson.build rename to guest/renderControl_enc/meson.build
diff --git a/system/renderControl_enc/renderControl.attrib b/guest/renderControl_enc/renderControl.attrib similarity index 100% rename from system/renderControl_enc/renderControl.attrib rename to guest/renderControl_enc/renderControl.attrib
diff --git a/system/renderControl_enc/renderControl.in b/guest/renderControl_enc/renderControl.in similarity index 100% rename from system/renderControl_enc/renderControl.in rename to guest/renderControl_enc/renderControl.in
diff --git a/system/renderControl_enc/renderControl.types b/guest/renderControl_enc/renderControl.types similarity index 100% rename from system/renderControl_enc/renderControl.types rename to guest/renderControl_enc/renderControl.types
diff --git a/system/renderControl_enc/renderControl_client_base.h b/guest/renderControl_enc/renderControl_client_base.h similarity index 100% rename from system/renderControl_enc/renderControl_client_base.h rename to guest/renderControl_enc/renderControl_client_base.h
diff --git a/system/renderControl_enc/renderControl_client_context.cpp b/guest/renderControl_enc/renderControl_client_context.cpp similarity index 100% rename from system/renderControl_enc/renderControl_client_context.cpp rename to guest/renderControl_enc/renderControl_client_context.cpp
diff --git a/system/renderControl_enc/renderControl_client_context.h b/guest/renderControl_enc/renderControl_client_context.h similarity index 100% rename from system/renderControl_enc/renderControl_client_context.h rename to guest/renderControl_enc/renderControl_client_context.h
diff --git a/system/renderControl_enc/renderControl_client_proc.h b/guest/renderControl_enc/renderControl_client_proc.h similarity index 100% rename from system/renderControl_enc/renderControl_client_proc.h rename to guest/renderControl_enc/renderControl_client_proc.h
diff --git a/system/renderControl_enc/renderControl_enc.cpp b/guest/renderControl_enc/renderControl_enc.cpp similarity index 100% rename from system/renderControl_enc/renderControl_enc.cpp rename to guest/renderControl_enc/renderControl_enc.cpp
diff --git a/system/renderControl_enc/renderControl_enc.h b/guest/renderControl_enc/renderControl_enc.h similarity index 100% rename from system/renderControl_enc/renderControl_enc.h rename to guest/renderControl_enc/renderControl_enc.h
diff --git a/system/renderControl_enc/renderControl_entry.cpp b/guest/renderControl_enc/renderControl_entry.cpp similarity index 100% rename from system/renderControl_enc/renderControl_entry.cpp rename to guest/renderControl_enc/renderControl_entry.cpp
diff --git a/system/renderControl_enc/renderControl_ftable.h b/guest/renderControl_enc/renderControl_ftable.h similarity index 100% rename from system/renderControl_enc/renderControl_ftable.h rename to guest/renderControl_enc/renderControl_ftable.h
diff --git a/system/renderControl_enc/renderControl_opcodes.h b/guest/renderControl_enc/renderControl_opcodes.h similarity index 100% rename from system/renderControl_enc/renderControl_opcodes.h rename to guest/renderControl_enc/renderControl_opcodes.h
diff --git a/system/renderControl_enc/renderControl_types.h b/guest/renderControl_enc/renderControl_types.h similarity index 100% rename from system/renderControl_enc/renderControl_types.h rename to guest/renderControl_enc/renderControl_types.h
diff --git a/system/vulkan/Android.mk b/guest/vulkan/Android.mk similarity index 100% rename from system/vulkan/Android.mk rename to guest/vulkan/Android.mk
diff --git a/system/vulkan/CMakeLists.txt b/guest/vulkan/CMakeLists.txt similarity index 100% rename from system/vulkan/CMakeLists.txt rename to guest/vulkan/CMakeLists.txt
diff --git a/system/vulkan/goldfish_vulkan.cpp b/guest/vulkan/goldfish_vulkan.cpp similarity index 100% rename from system/vulkan/goldfish_vulkan.cpp rename to guest/vulkan/goldfish_vulkan.cpp
diff --git a/system/vulkan/meson.build b/guest/vulkan/meson.build similarity index 100% rename from system/vulkan/meson.build rename to guest/vulkan/meson.build
diff --git a/system/vulkan/vk.xml b/guest/vulkan/vk.xml similarity index 100% rename from system/vulkan/vk.xml rename to guest/vulkan/vk.xml
diff --git a/system/vulkan/vk_icd_gen.py b/guest/vulkan/vk_icd_gen.py similarity index 100% rename from system/vulkan/vk_icd_gen.py rename to guest/vulkan/vk_icd_gen.py
diff --git a/system/vulkan_enc/Android.mk b/guest/vulkan_enc/Android.mk similarity index 100% rename from system/vulkan_enc/Android.mk rename to guest/vulkan_enc/Android.mk
diff --git a/system/vulkan_enc/AndroidHardwareBuffer.cpp b/guest/vulkan_enc/AndroidHardwareBuffer.cpp similarity index 100% rename from system/vulkan_enc/AndroidHardwareBuffer.cpp rename to guest/vulkan_enc/AndroidHardwareBuffer.cpp
diff --git a/system/vulkan_enc/AndroidHardwareBuffer.h b/guest/vulkan_enc/AndroidHardwareBuffer.h similarity index 100% rename from system/vulkan_enc/AndroidHardwareBuffer.h rename to guest/vulkan_enc/AndroidHardwareBuffer.h
diff --git a/system/vulkan_enc/CMakeLists.txt b/guest/vulkan_enc/CMakeLists.txt similarity index 100% rename from system/vulkan_enc/CMakeLists.txt rename to guest/vulkan_enc/CMakeLists.txt
diff --git a/system/vulkan_enc/CommandBufferStagingStream.cpp b/guest/vulkan_enc/CommandBufferStagingStream.cpp similarity index 100% rename from system/vulkan_enc/CommandBufferStagingStream.cpp rename to guest/vulkan_enc/CommandBufferStagingStream.cpp
diff --git a/system/vulkan_enc/CommandBufferStagingStream.h b/guest/vulkan_enc/CommandBufferStagingStream.h similarity index 100% rename from system/vulkan_enc/CommandBufferStagingStream.h rename to guest/vulkan_enc/CommandBufferStagingStream.h
diff --git a/system/vulkan_enc/DescriptorSetVirtualization.cpp b/guest/vulkan_enc/DescriptorSetVirtualization.cpp similarity index 100% rename from system/vulkan_enc/DescriptorSetVirtualization.cpp rename to guest/vulkan_enc/DescriptorSetVirtualization.cpp
diff --git a/system/vulkan_enc/DescriptorSetVirtualization.h b/guest/vulkan_enc/DescriptorSetVirtualization.h similarity index 100% rename from system/vulkan_enc/DescriptorSetVirtualization.h rename to guest/vulkan_enc/DescriptorSetVirtualization.h
diff --git a/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp b/guest/vulkan_enc/HostVisibleMemoryVirtualization.cpp similarity index 100% rename from system/vulkan_enc/HostVisibleMemoryVirtualization.cpp rename to guest/vulkan_enc/HostVisibleMemoryVirtualization.cpp
diff --git a/system/vulkan_enc/HostVisibleMemoryVirtualization.h b/guest/vulkan_enc/HostVisibleMemoryVirtualization.h similarity index 100% rename from system/vulkan_enc/HostVisibleMemoryVirtualization.h rename to guest/vulkan_enc/HostVisibleMemoryVirtualization.h
diff --git a/system/vulkan_enc/ResourceTracker.cpp b/guest/vulkan_enc/ResourceTracker.cpp similarity index 100% rename from system/vulkan_enc/ResourceTracker.cpp rename to guest/vulkan_enc/ResourceTracker.cpp
diff --git a/system/vulkan_enc/ResourceTracker.h b/guest/vulkan_enc/ResourceTracker.h similarity index 100% rename from system/vulkan_enc/ResourceTracker.h rename to guest/vulkan_enc/ResourceTracker.h
diff --git a/system/vulkan_enc/Resources.cpp b/guest/vulkan_enc/Resources.cpp similarity index 100% rename from system/vulkan_enc/Resources.cpp rename to guest/vulkan_enc/Resources.cpp
diff --git a/system/vulkan_enc/Resources.h b/guest/vulkan_enc/Resources.h similarity index 100% rename from system/vulkan_enc/Resources.h rename to guest/vulkan_enc/Resources.h
diff --git a/system/vulkan_enc/Validation.cpp b/guest/vulkan_enc/Validation.cpp similarity index 100% rename from system/vulkan_enc/Validation.cpp rename to guest/vulkan_enc/Validation.cpp
diff --git a/system/vulkan_enc/Validation.h b/guest/vulkan_enc/Validation.h similarity index 100% rename from system/vulkan_enc/Validation.h rename to guest/vulkan_enc/Validation.h
diff --git a/system/vulkan_enc/VkEncoder.cpp b/guest/vulkan_enc/VkEncoder.cpp similarity index 100% rename from system/vulkan_enc/VkEncoder.cpp rename to guest/vulkan_enc/VkEncoder.cpp
diff --git a/system/vulkan_enc/VkEncoder.cpp.inl b/guest/vulkan_enc/VkEncoder.cpp.inl similarity index 100% rename from system/vulkan_enc/VkEncoder.cpp.inl rename to guest/vulkan_enc/VkEncoder.cpp.inl
diff --git a/system/vulkan_enc/VkEncoder.h b/guest/vulkan_enc/VkEncoder.h similarity index 100% rename from system/vulkan_enc/VkEncoder.h rename to guest/vulkan_enc/VkEncoder.h
diff --git a/system/vulkan_enc/VkEncoder.h.inl b/guest/vulkan_enc/VkEncoder.h.inl similarity index 100% rename from system/vulkan_enc/VkEncoder.h.inl rename to guest/vulkan_enc/VkEncoder.h.inl
diff --git a/system/vulkan_enc/VulkanHandleMapping.cpp b/guest/vulkan_enc/VulkanHandleMapping.cpp similarity index 100% rename from system/vulkan_enc/VulkanHandleMapping.cpp rename to guest/vulkan_enc/VulkanHandleMapping.cpp
diff --git a/system/vulkan_enc/VulkanHandleMapping.h b/guest/vulkan_enc/VulkanHandleMapping.h similarity index 100% rename from system/vulkan_enc/VulkanHandleMapping.h rename to guest/vulkan_enc/VulkanHandleMapping.h
diff --git a/system/vulkan_enc/VulkanHandles.h b/guest/vulkan_enc/VulkanHandles.h similarity index 100% rename from system/vulkan_enc/VulkanHandles.h rename to guest/vulkan_enc/VulkanHandles.h
diff --git a/system/vulkan_enc/VulkanStreamGuest.cpp b/guest/vulkan_enc/VulkanStreamGuest.cpp similarity index 100% rename from system/vulkan_enc/VulkanStreamGuest.cpp rename to guest/vulkan_enc/VulkanStreamGuest.cpp
diff --git a/system/vulkan_enc/VulkanStreamGuest.h b/guest/vulkan_enc/VulkanStreamGuest.h similarity index 100% rename from system/vulkan_enc/VulkanStreamGuest.h rename to guest/vulkan_enc/VulkanStreamGuest.h
diff --git a/system/vulkan_enc/func_table.cpp b/guest/vulkan_enc/func_table.cpp similarity index 100% rename from system/vulkan_enc/func_table.cpp rename to guest/vulkan_enc/func_table.cpp
diff --git a/system/vulkan_enc/func_table.h b/guest/vulkan_enc/func_table.h similarity index 100% rename from system/vulkan_enc/func_table.h rename to guest/vulkan_enc/func_table.h
diff --git a/system/vulkan_enc/goldfish_vk_counting_guest.cpp b/guest/vulkan_enc/goldfish_vk_counting_guest.cpp similarity index 100% rename from system/vulkan_enc/goldfish_vk_counting_guest.cpp rename to guest/vulkan_enc/goldfish_vk_counting_guest.cpp
diff --git a/system/vulkan_enc/goldfish_vk_counting_guest.h b/guest/vulkan_enc/goldfish_vk_counting_guest.h similarity index 100% rename from system/vulkan_enc/goldfish_vk_counting_guest.h rename to guest/vulkan_enc/goldfish_vk_counting_guest.h
diff --git a/system/vulkan_enc/goldfish_vk_deepcopy_guest.cpp b/guest/vulkan_enc/goldfish_vk_deepcopy_guest.cpp similarity index 100% rename from system/vulkan_enc/goldfish_vk_deepcopy_guest.cpp rename to guest/vulkan_enc/goldfish_vk_deepcopy_guest.cpp
diff --git a/system/vulkan_enc/goldfish_vk_deepcopy_guest.h b/guest/vulkan_enc/goldfish_vk_deepcopy_guest.h similarity index 100% rename from system/vulkan_enc/goldfish_vk_deepcopy_guest.h rename to guest/vulkan_enc/goldfish_vk_deepcopy_guest.h
diff --git a/system/vulkan_enc/goldfish_vk_extension_structs_guest.cpp b/guest/vulkan_enc/goldfish_vk_extension_structs_guest.cpp similarity index 100% rename from system/vulkan_enc/goldfish_vk_extension_structs_guest.cpp rename to guest/vulkan_enc/goldfish_vk_extension_structs_guest.cpp
diff --git a/system/vulkan_enc/goldfish_vk_extension_structs_guest.h b/guest/vulkan_enc/goldfish_vk_extension_structs_guest.h similarity index 100% rename from system/vulkan_enc/goldfish_vk_extension_structs_guest.h rename to guest/vulkan_enc/goldfish_vk_extension_structs_guest.h
diff --git a/system/vulkan_enc/goldfish_vk_handlemap_guest.cpp b/guest/vulkan_enc/goldfish_vk_handlemap_guest.cpp similarity index 100% rename from system/vulkan_enc/goldfish_vk_handlemap_guest.cpp rename to guest/vulkan_enc/goldfish_vk_handlemap_guest.cpp
diff --git a/system/vulkan_enc/goldfish_vk_handlemap_guest.h b/guest/vulkan_enc/goldfish_vk_handlemap_guest.h similarity index 100% rename from system/vulkan_enc/goldfish_vk_handlemap_guest.h rename to guest/vulkan_enc/goldfish_vk_handlemap_guest.h
diff --git a/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp b/guest/vulkan_enc/goldfish_vk_marshaling_guest.cpp similarity index 100% rename from system/vulkan_enc/goldfish_vk_marshaling_guest.cpp rename to guest/vulkan_enc/goldfish_vk_marshaling_guest.cpp
diff --git a/system/vulkan_enc/goldfish_vk_marshaling_guest.h b/guest/vulkan_enc/goldfish_vk_marshaling_guest.h similarity index 100% rename from system/vulkan_enc/goldfish_vk_marshaling_guest.h rename to guest/vulkan_enc/goldfish_vk_marshaling_guest.h
diff --git a/system/vulkan_enc/goldfish_vk_private_defs.h b/guest/vulkan_enc/goldfish_vk_private_defs.h similarity index 100% rename from system/vulkan_enc/goldfish_vk_private_defs.h rename to guest/vulkan_enc/goldfish_vk_private_defs.h
diff --git a/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp b/guest/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp similarity index 100% rename from system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp rename to guest/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp
diff --git a/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.h b/guest/vulkan_enc/goldfish_vk_reserved_marshaling_guest.h similarity index 100% rename from system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.h rename to guest/vulkan_enc/goldfish_vk_reserved_marshaling_guest.h
diff --git a/system/vulkan_enc/goldfish_vk_transform_guest.cpp b/guest/vulkan_enc/goldfish_vk_transform_guest.cpp similarity index 100% rename from system/vulkan_enc/goldfish_vk_transform_guest.cpp rename to guest/vulkan_enc/goldfish_vk_transform_guest.cpp
diff --git a/system/vulkan_enc/goldfish_vk_transform_guest.h b/guest/vulkan_enc/goldfish_vk_transform_guest.h similarity index 100% rename from system/vulkan_enc/goldfish_vk_transform_guest.h rename to guest/vulkan_enc/goldfish_vk_transform_guest.h
diff --git a/system/vulkan_enc/meson.build b/guest/vulkan_enc/meson.build similarity index 100% rename from system/vulkan_enc/meson.build rename to guest/vulkan_enc/meson.build
diff --git a/system/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl b/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl similarity index 100% rename from system/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl rename to guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl
diff --git a/system/vulkan_enc/vk_format_info.h b/guest/vulkan_enc/vk_format_info.h similarity index 100% rename from system/vulkan_enc/vk_format_info.h rename to guest/vulkan_enc/vk_format_info.h
diff --git a/system/vulkan_enc/vk_platform_compat.h b/guest/vulkan_enc/vk_platform_compat.h similarity index 100% rename from system/vulkan_enc/vk_platform_compat.h rename to guest/vulkan_enc/vk_platform_compat.h
diff --git a/system/vulkan_enc/vk_struct_id.h b/guest/vulkan_enc/vk_struct_id.h similarity index 100% rename from system/vulkan_enc/vk_struct_id.h rename to guest/vulkan_enc/vk_struct_id.h
diff --git a/system/vulkan_enc/vk_util.h b/guest/vulkan_enc/vk_util.h similarity index 100% rename from system/vulkan_enc/vk_util.h rename to guest/vulkan_enc/vk_util.h
diff --git a/system/vulkan_enc/vulkan_enc_unittests.cpp b/guest/vulkan_enc/vulkan_enc_unittests.cpp similarity index 100% rename from system/vulkan_enc/vulkan_enc_unittests.cpp rename to guest/vulkan_enc/vulkan_enc_unittests.cpp
diff --git a/system/vulkan_enc/vulkan_gfxstream.h b/guest/vulkan_enc/vulkan_gfxstream.h similarity index 100% rename from system/vulkan_enc/vulkan_gfxstream.h rename to guest/vulkan_enc/vulkan_gfxstream.h
diff --git a/system/vulkan_enc/vulkan_gfxstream_structure_type.h b/guest/vulkan_enc/vulkan_gfxstream_structure_type.h similarity index 100% rename from system/vulkan_enc/vulkan_gfxstream_structure_type.h rename to guest/vulkan_enc/vulkan_gfxstream_structure_type.h
diff --git a/system/vulkan_enc_unit_tests/Android.mk b/guest/vulkan_enc_unit_tests/Android.mk similarity index 100% rename from system/vulkan_enc_unit_tests/Android.mk rename to guest/vulkan_enc_unit_tests/Android.mk
diff --git a/system/vulkan_enc_unit_tests/CommandBufferStagingStream_test.cpp b/guest/vulkan_enc_unit_tests/CommandBufferStagingStream_test.cpp similarity index 100% rename from system/vulkan_enc_unit_tests/CommandBufferStagingStream_test.cpp rename to guest/vulkan_enc_unit_tests/CommandBufferStagingStream_test.cpp