diff options
author | Joshua Duong <joshuaduong@google.com> | 2022-10-17 21:41:48 -0700 |
---|---|---|
committer | Joshua Duong <joshuaduong@google.com> | 2022-10-25 08:03:33 -0700 |
commit | cda9cf192f99e5e4c6cb1ca6a74b44cf646e7dda (patch) | |
tree | df4ea53413878a8f678c7b1492f8ee8556e7f156 | |
parent | 5891f1197fdaba27a34d8345eae7bec8659e3c31 (diff) | |
download | goldfish-opengl-cda9cf192f99e5e4c6cb1ca6a74b44cf646e7dda.tar.gz |
android/base -> aemu/base refactor.
Bug: 237805597
Test: presubmit
Change-Id: I9b8eafe998ef433fdac9a7614c710563e3460cba
-rw-r--r-- | android-emu/Android.bp | 34 | ||||
-rw-r--r-- | android-emu/Android.mk | 34 | ||||
-rw-r--r-- | android-emu/CMakeLists.txt | 12 | ||||
-rw-r--r-- | android-emu/aemu/base/AlignedBuf.cpp (renamed from android-emu/android/base/AlignedBuf.cpp) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/AlignedBuf.h (renamed from android-emu/android/base/AlignedBuf.h) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/Allocator.h (renamed from android-emu/android/base/Allocator.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/AndroidHealthMonitor.cpp (renamed from android-emu/android/base/AndroidHealthMonitor.cpp) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/AndroidHealthMonitor.h (renamed from android-emu/android/base/AndroidHealthMonitor.h) | 8 | ||||
-rw-r--r-- | android-emu/aemu/base/AndroidHealthMonitorConsumer.h (renamed from android-emu/android/base/AndroidHealthMonitorConsumer.h) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/AndroidHealthMonitorConsumerBasic.cpp (renamed from android-emu/android/base/AndroidHealthMonitorConsumerBasic.cpp) | 4 | ||||
-rw-r--r-- | android-emu/aemu/base/AndroidHealthMonitorConsumerBasic.h (renamed from android-emu/android/base/AndroidHealthMonitorConsumerBasic.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/AndroidSubAllocator.cpp (renamed from android-emu/android/base/AndroidSubAllocator.cpp) | 6 | ||||
-rw-r--r-- | android-emu/aemu/base/AndroidSubAllocator.h (renamed from android-emu/android/base/AndroidSubAllocator.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/BumpPool.h (renamed from android-emu/android/base/BumpPool.h) | 4 | ||||
-rw-r--r-- | android-emu/aemu/base/Compiler.h (renamed from android-emu/android/base/Compiler.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/EnumFlags.h (renamed from android-emu/android/base/EnumFlags.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/Optional.h (renamed from android-emu/android/base/Optional.h) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/Pool.cpp (renamed from android-emu/android/base/Pool.cpp) | 4 | ||||
-rw-r--r-- | android-emu/aemu/base/Pool.h (renamed from android-emu/android/base/Pool.h) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/Process.cpp (renamed from android-emu/android/base/Process.cpp) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/Process.h (renamed from android-emu/android/base/Process.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/StringFormat.cpp (renamed from android-emu/android/base/StringFormat.cpp) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/StringFormat.h (renamed from android-emu/android/base/StringFormat.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/Tracing.cpp (renamed from android-emu/android/base/Tracing.cpp) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/Tracing.h (renamed from android-emu/android/base/Tracing.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/TypeTraits.h (renamed from android-emu/android/base/TypeTraits.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/address_space.h (renamed from android-emu/android/base/address_space.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/containers/EntityManager.h (renamed from android-emu/android/base/containers/EntityManager.h) | 4 | ||||
-rw-r--r-- | android-emu/aemu/base/containers/HybridComponentManager.h (renamed from android-emu/android/base/containers/HybridComponentManager.h) | 4 | ||||
-rw-r--r-- | android-emu/aemu/base/containers/Lookup.h (renamed from android-emu/android/base/containers/Lookup.h) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/containers/SmallVector.h (renamed from android-emu/android/base/containers/SmallVector.h) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/files/MemStream.cpp (renamed from android-emu/android/base/files/MemStream.cpp) | 4 | ||||
-rw-r--r-- | android-emu/aemu/base/files/MemStream.h (renamed from android-emu/android/base/files/MemStream.h) | 4 | ||||
-rw-r--r-- | android-emu/aemu/base/files/Stream.cpp (renamed from android-emu/android/base/files/Stream.cpp) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/files/Stream.h (renamed from android-emu/android/base/files/Stream.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/files/StreamSerializing.cpp (renamed from android-emu/android/base/files/StreamSerializing.cpp) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/files/StreamSerializing.h (renamed from android-emu/android/base/files/StreamSerializing.h) | 8 | ||||
-rw-r--r-- | android-emu/aemu/base/fit/Defer.h (renamed from android-emu/android/base/fit/Defer.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/fit/Function.h (renamed from android-emu/android/base/fit/Function.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/fit/FunctionInternal.h (renamed from android-emu/android/base/fit/FunctionInternal.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/fit/Nullable.h (renamed from android-emu/android/base/fit/Nullable.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/fit/README (renamed from android-emu/android/base/fit/README) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/fit/ThreadChecker.h (renamed from android-emu/android/base/fit/ThreadChecker.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/fit/ThreadSafety.h (renamed from android-emu/android/base/fit/ThreadSafety.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/fit/UtilityInternal.h (renamed from android-emu/android/base/fit/UtilityInternal.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/meson.build (renamed from android-emu/android/base/meson.build) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/ring_buffer.c (renamed from android-emu/android/base/ring_buffer.c) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/ring_buffer.h (renamed from android-emu/android/base/ring_buffer.h) | 0 | ||||
-rw-r--r-- | android-emu/aemu/base/synchronization/AndroidConditionVariable.h (renamed from android-emu/android/base/synchronization/AndroidConditionVariable.h) | 4 | ||||
-rw-r--r-- | android-emu/aemu/base/synchronization/AndroidLock.h (renamed from android-emu/android/base/synchronization/AndroidLock.h) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/synchronization/AndroidMessageChannel.cpp (renamed from android-emu/android/base/synchronization/AndroidMessageChannel.cpp) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/synchronization/AndroidMessageChannel.h (renamed from android-emu/android/base/synchronization/AndroidMessageChannel.h) | 6 | ||||
-rw-r--r-- | android-emu/aemu/base/threads/AndroidFunctorThread.cpp (renamed from android-emu/android/base/threads/AndroidFunctorThread.cpp) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/threads/AndroidFunctorThread.h (renamed from android-emu/android/base/threads/AndroidFunctorThread.h) | 6 | ||||
-rw-r--r-- | android-emu/aemu/base/threads/AndroidThread.h (renamed from android-emu/android/base/threads/AndroidThread.h) | 6 | ||||
-rw-r--r-- | android-emu/aemu/base/threads/AndroidThreadStore.cpp (renamed from android-emu/android/base/threads/AndroidThreadStore.cpp) | 4 | ||||
-rw-r--r-- | android-emu/aemu/base/threads/AndroidThreadStore.h (renamed from android-emu/android/base/threads/AndroidThreadStore.h) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/threads/AndroidThreadTypes.h (renamed from android-emu/android/base/threads/AndroidThreadTypes.h) | 2 | ||||
-rw-r--r-- | android-emu/aemu/base/threads/AndroidThread_pthread.cpp (renamed from android-emu/android/base/threads/AndroidThread_pthread.cpp) | 4 | ||||
-rw-r--r-- | android-emu/aemu/base/threads/AndroidWorkPool.cpp (renamed from android-emu/android/base/threads/AndroidWorkPool.cpp) | 10 | ||||
-rw-r--r-- | android-emu/aemu/base/threads/AndroidWorkPool.h (renamed from android-emu/android/base/threads/AndroidWorkPool.h) | 0 | ||||
-rw-r--r-- | shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl | 2 | ||||
-rw-r--r-- | shared/OpenglCodecCommon/StateTrackingSupport.h | 4 | ||||
-rw-r--r-- | shared/OpenglCodecCommon/TextureSharedData.h | 2 | ||||
-rw-r--r-- | system/GLESv1_enc/gl_enc.cpp | 2 | ||||
-rw-r--r-- | system/GLESv2_enc/gl2_enc.cpp | 2 | ||||
-rw-r--r-- | system/OpenglSystemCommon/AddressSpaceStream.cpp | 2 | ||||
-rw-r--r-- | system/OpenglSystemCommon/AddressSpaceStream.h | 2 | ||||
-rw-r--r-- | system/OpenglSystemCommon/HostConnection.cpp | 10 | ||||
-rw-r--r-- | system/OpenglSystemCommon/address_space_graphics_types.h | 2 | ||||
-rw-r--r-- | system/egl/egl.cpp | 4 | ||||
-rw-r--r-- | system/gralloc/gralloc_old.cpp | 2 | ||||
-rw-r--r-- | system/hals/mapper3.cpp | 2 | ||||
-rw-r--r-- | system/hwc2/DrmPresenter.h | 2 | ||||
-rw-r--r-- | system/hwc3/DrmClient.h | 2 | ||||
-rw-r--r-- | system/renderControl_enc/renderControl_enc.cpp | 2 | ||||
-rw-r--r-- | system/vulkan_enc/DescriptorSetVirtualization.h | 2 | ||||
-rw-r--r-- | system/vulkan_enc/HostVisibleMemoryVirtualization.cpp | 2 | ||||
-rw-r--r-- | system/vulkan_enc/HostVisibleMemoryVirtualization.h | 2 | ||||
-rw-r--r-- | system/vulkan_enc/ResourceTracker.cpp | 10 | ||||
-rw-r--r-- | system/vulkan_enc/ResourceTracker.h | 2 | ||||
-rw-r--r-- | system/vulkan_enc/VkEncoder.cpp | 6 | ||||
-rw-r--r-- | system/vulkan_enc/VkEncoder.h | 2 | ||||
-rw-r--r-- | system/vulkan_enc/VulkanStreamGuest.h | 8 | ||||
-rw-r--r-- | system/vulkan_enc/goldfish_vk_deepcopy_guest.h | 2 | ||||
-rw-r--r-- | system/vulkan_enc/vulkan_enc_unittests.cpp | 6 |
86 files changed, 145 insertions, 145 deletions
diff --git a/android-emu/Android.bp b/android-emu/Android.bp index 62768634..cec615da 100644 --- a/android-emu/Android.bp +++ b/android-emu/Android.bp @@ -12,22 +12,22 @@ cc_library_shared { name: "libandroidemu", vendor: true, srcs: [ - "android/base/AlignedBuf.cpp", - "android/base/files/MemStream.cpp", - "android/base/files/Stream.cpp", - "android/base/files/StreamSerializing.cpp", - "android/base/Pool.cpp", - "android/base/StringFormat.cpp", - "android/base/Process.cpp", - "android/base/AndroidSubAllocator.cpp", - "android/base/synchronization/AndroidMessageChannel.cpp", - "android/base/threads/AndroidFunctorThread.cpp", - "android/base/threads/AndroidThreadStore.cpp", - "android/base/threads/AndroidThread_pthread.cpp", - "android/base/threads/AndroidWorkPool.cpp", - "android/base/AndroidHealthMonitor.cpp", - "android/base/AndroidHealthMonitorConsumerBasic.cpp", - "android/base/Tracing.cpp", + "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", ], shared_libs: [ @@ -50,7 +50,7 @@ cc_library_static { name: "libringbuffer", vendor: true, srcs: [ - "android/base/ring_buffer.c", + "aemu/base/ring_buffer.c", ], shared_libs: [ "libcutils", diff --git a/android-emu/Android.mk b/android-emu/Android.mk index 2ec7f1d0..0790be3c 100644 --- a/android-emu/Android.mk +++ b/android-emu/Android.mk @@ -12,22 +12,22 @@ LOCAL_CFLAGS += \ -fstrict-aliasing \ LOCAL_SRC_FILES := \ - android/base/AlignedBuf.cpp \ - android/base/files/MemStream.cpp \ - android/base/files/Stream.cpp \ - android/base/files/StreamSerializing.cpp \ - android/base/Pool.cpp \ - android/base/StringFormat.cpp \ - android/base/Process.cpp \ - android/base/AndroidSubAllocator.cpp \ - android/base/synchronization/AndroidMessageChannel.cpp \ - android/base/threads/AndroidFunctorThread.cpp \ - android/base/threads/AndroidThreadStore.cpp \ - android/base/threads/AndroidThread_pthread.cpp \ - android/base/threads/AndroidWorkPool.cpp \ - android/base/AndroidHealthMonitor.cpp \ - android/base/AndroidHealthMonitorConsumerBasic.cpp \ - android/base/Tracing.cpp \ + 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 \ $(call emugl-end-module) @@ -36,7 +36,7 @@ $(call emugl-begin-static-library,libringbuffer) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) LOCAL_SRC_FILES := \ - android/base/ring_buffer.c \ + aemu/base/ring_buffer.c \ $(call emugl-end-module) endif diff --git a/android-emu/CMakeLists.txt b/android-emu/CMakeLists.txt index 75c3664f..9e35990f 100644 --- a/android-emu/CMakeLists.txt +++ b/android-emu/CMakeLists.txt @@ -1,9 +1,9 @@ # 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" "cb03eba8dae73ce330e2e8fc782b4db1e4ba1eeb0318642c85f0d60b18e1bb94") -set(androidemu_src android/base/AlignedBuf.cpp android/base/files/MemStream.cpp android/base/files/Stream.cpp android/base/files/StreamSerializing.cpp android/base/Pool.cpp android/base/StringFormat.cpp android/base/Process.cpp android/base/AndroidSubAllocator.cpp android/base/synchronization/AndroidMessageChannel.cpp android/base/threads/AndroidFunctorThread.cpp android/base/threads/AndroidThreadStore.cpp android/base/threads/AndroidThread_pthread.cpp android/base/threads/AndroidWorkPool.cpp android/base/AndroidHealthMonitor.cpp android/base/AndroidHealthMonitorConsumerBasic.cpp android/base/Tracing.cpp android/utils/debug.c) -android_add_library(TARGET androidemu SHARED LICENSE Apache-2.0 SRC android/base/AlignedBuf.cpp android/base/files/MemStream.cpp android/base/files/Stream.cpp android/base/files/StreamSerializing.cpp android/base/Pool.cpp android/base/StringFormat.cpp android/base/Process.cpp android/base/AndroidSubAllocator.cpp android/base/synchronization/AndroidMessageChannel.cpp android/base/threads/AndroidFunctorThread.cpp android/base/threads/AndroidThreadStore.cpp android/base/threads/AndroidThread_pthread.cpp android/base/threads/AndroidWorkPool.cpp android/base/AndroidHealthMonitor.cpp android/base/AndroidHealthMonitorConsumerBasic.cpp android/base/Tracing.cpp android/utils/debug.c) +android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/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}/./system/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" "-DLOG_TAG=\"androidemu\"") target_compile_options(androidemu PRIVATE "-fvisibility=default" "-Wno-unused-parameter" "-Wno-missing-field-initializers" "-fstrict-aliasing") @@ -11,9 +11,9 @@ 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" "cb03eba8dae73ce330e2e8fc782b4db1e4ba1eeb0318642c85f0d60b18e1bb94") -set(ringbuffer_src android/base/ring_buffer.c) -android_add_library(TARGET ringbuffer LICENSE Apache-2.0 SRC android/base/ring_buffer.c) +android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/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}/./system/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") target_compile_options(ringbuffer PRIVATE "-fvisibility=default" "-Wno-unused-parameter") diff --git a/android-emu/android/base/AlignedBuf.cpp b/android-emu/aemu/base/AlignedBuf.cpp index a1bc6f34..a1bc6f34 100644 --- a/android-emu/android/base/AlignedBuf.cpp +++ b/android-emu/aemu/base/AlignedBuf.cpp diff --git a/android-emu/android/base/AlignedBuf.h b/android-emu/aemu/base/AlignedBuf.h index 5955fa13..e0c1106c 100644 --- a/android-emu/android/base/AlignedBuf.h +++ b/android-emu/aemu/base/AlignedBuf.h @@ -14,7 +14,7 @@ #pragma once -#include "android/base/Compiler.h" +#include "aemu/base/Compiler.h" #include <algorithm> #include <atomic> diff --git a/android-emu/android/base/Allocator.h b/android-emu/aemu/base/Allocator.h index d875de1d..d875de1d 100644 --- a/android-emu/android/base/Allocator.h +++ b/android-emu/aemu/base/Allocator.h diff --git a/android-emu/android/base/AndroidHealthMonitor.cpp b/android-emu/aemu/base/AndroidHealthMonitor.cpp index 9934f0af..79eeda8c 100644 --- a/android-emu/android/base/AndroidHealthMonitor.cpp +++ b/android-emu/aemu/base/AndroidHealthMonitor.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "android/base/AndroidHealthMonitor.h" +#include "aemu/base/AndroidHealthMonitor.h" #include <map> #include <sys/time.h> diff --git a/android-emu/android/base/AndroidHealthMonitor.h b/android-emu/aemu/base/AndroidHealthMonitor.h index 2a5e1715..96abe185 100644 --- a/android-emu/android/base/AndroidHealthMonitor.h +++ b/android-emu/aemu/base/AndroidHealthMonitor.h @@ -28,10 +28,10 @@ #include <variant> #include <utility> -#include "android/base/AndroidHealthMonitorConsumer.h" -#include "android/base/synchronization/AndroidConditionVariable.h" -#include "android/base/synchronization/AndroidLock.h" -#include "android/base/threads/AndroidThread.h" +#include "aemu/base/AndroidHealthMonitorConsumer.h" +#include "aemu/base/synchronization/AndroidConditionVariable.h" +#include "aemu/base/synchronization/AndroidLock.h" +#include "aemu/base/threads/AndroidThread.h" #include <log/log.h> diff --git a/android-emu/android/base/AndroidHealthMonitorConsumer.h b/android-emu/aemu/base/AndroidHealthMonitorConsumer.h index 7144e8b3..642cd504 100644 --- a/android-emu/android/base/AndroidHealthMonitorConsumer.h +++ b/android-emu/aemu/base/AndroidHealthMonitorConsumer.h @@ -22,7 +22,7 @@ #include <unordered_map> #include <variant> -#include "android/base/threads/AndroidThread.h" +#include "aemu/base/threads/AndroidThread.h" // Interface for consuming events from HealthMonitor diff --git a/android-emu/android/base/AndroidHealthMonitorConsumerBasic.cpp b/android-emu/aemu/base/AndroidHealthMonitorConsumerBasic.cpp index 76f4ef8a..5a54bfc7 100644 --- a/android-emu/android/base/AndroidHealthMonitorConsumerBasic.cpp +++ b/android-emu/aemu/base/AndroidHealthMonitorConsumerBasic.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/AndroidHealthMonitorConsumerBasic.h" +#include "aemu/base/AndroidHealthMonitorConsumerBasic.h" #include <log/log.h> -#include "android/base/Process.h" +#include "aemu/base/Process.h" namespace android { namespace base { diff --git a/android-emu/android/base/AndroidHealthMonitorConsumerBasic.h b/android-emu/aemu/base/AndroidHealthMonitorConsumerBasic.h index 9f3dc037..9f3dc037 100644 --- a/android-emu/android/base/AndroidHealthMonitorConsumerBasic.h +++ b/android-emu/aemu/base/AndroidHealthMonitorConsumerBasic.h diff --git a/android-emu/android/base/AndroidSubAllocator.cpp b/android-emu/aemu/base/AndroidSubAllocator.cpp index 0b17a8a4..ac0a2a0a 100644 --- a/android-emu/android/base/AndroidSubAllocator.cpp +++ b/android-emu/aemu/base/AndroidSubAllocator.cpp @@ -11,10 +11,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/AndroidSubAllocator.h" +#include "aemu/base/AndroidSubAllocator.h" -#include "android/base/address_space.h" -#include "android/base/files/Stream.h" +#include "aemu/base/address_space.h" +#include "aemu/base/files/Stream.h" #include <iomanip> #include <sstream> diff --git a/android-emu/android/base/AndroidSubAllocator.h b/android-emu/aemu/base/AndroidSubAllocator.h index 84421373..84421373 100644 --- a/android-emu/android/base/AndroidSubAllocator.h +++ b/android-emu/aemu/base/AndroidSubAllocator.h diff --git a/android-emu/android/base/BumpPool.h b/android-emu/aemu/base/BumpPool.h index 545e9e36..a1c1280b 100644 --- a/android-emu/android/base/BumpPool.h +++ b/android-emu/aemu/base/BumpPool.h @@ -13,8 +13,8 @@ // limitations under the License. #pragma once -#include "android/base/AlignedBuf.h" -#include "android/base/Allocator.h" +#include "aemu/base/AlignedBuf.h" +#include "aemu/base/Allocator.h" #include <vector> #include <unordered_set> diff --git a/android-emu/android/base/Compiler.h b/android-emu/aemu/base/Compiler.h index 00261b04..00261b04 100644 --- a/android-emu/android/base/Compiler.h +++ b/android-emu/aemu/base/Compiler.h diff --git a/android-emu/android/base/EnumFlags.h b/android-emu/aemu/base/EnumFlags.h index 1597dda3..1597dda3 100644 --- a/android-emu/android/base/EnumFlags.h +++ b/android-emu/aemu/base/EnumFlags.h diff --git a/android-emu/android/base/Optional.h b/android-emu/aemu/base/Optional.h index 4ed0c394..d0a8aa77 100644 --- a/android-emu/android/base/Optional.h +++ b/android-emu/aemu/base/Optional.h @@ -14,7 +14,7 @@ #pragma once -#include "android/base/TypeTraits.h" +#include "aemu/base/TypeTraits.h" #include <log/log.h> diff --git a/android-emu/android/base/Pool.cpp b/android-emu/aemu/base/Pool.cpp index 6aa47b4c..1891e2ca 100644 --- a/android-emu/android/base/Pool.cpp +++ b/android-emu/aemu/base/Pool.cpp @@ -11,9 +11,9 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/Pool.h" +#include "aemu/base/Pool.h" -#include "android/base/AlignedBuf.h" +#include "aemu/base/AlignedBuf.h" #include <vector> diff --git a/android-emu/android/base/Pool.h b/android-emu/aemu/base/Pool.h index 14a39f8a..616a35b4 100644 --- a/android-emu/android/base/Pool.h +++ b/android-emu/aemu/base/Pool.h @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "android/base/Allocator.h" +#include "aemu/base/Allocator.h" #include <unordered_set> diff --git a/android-emu/android/base/Process.cpp b/android-emu/aemu/base/Process.cpp index 31552ea4..d4f2ee78 100644 --- a/android-emu/android/base/Process.cpp +++ b/android-emu/aemu/base/Process.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/Process.h" +#include "aemu/base/Process.h" #if defined(__linux__) #include <fstream> diff --git a/android-emu/android/base/Process.h b/android-emu/aemu/base/Process.h index 003058ec..003058ec 100644 --- a/android-emu/android/base/Process.h +++ b/android-emu/aemu/base/Process.h diff --git a/android-emu/android/base/StringFormat.cpp b/android-emu/aemu/base/StringFormat.cpp index 58fb947a..2f97e69f 100644 --- a/android-emu/android/base/StringFormat.cpp +++ b/android-emu/aemu/base/StringFormat.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/StringFormat.h" +#include "aemu/base/StringFormat.h" #include <stdio.h> diff --git a/android-emu/android/base/StringFormat.h b/android-emu/aemu/base/StringFormat.h index 9b68c243..9b68c243 100644 --- a/android-emu/android/base/StringFormat.h +++ b/android-emu/aemu/base/StringFormat.h diff --git a/android-emu/android/base/Tracing.cpp b/android-emu/aemu/base/Tracing.cpp index 605ff07f..29805377 100644 --- a/android-emu/android/base/Tracing.cpp +++ b/android-emu/aemu/base/Tracing.cpp @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/Tracing.h" +#include "aemu/base/Tracing.h" #if defined(__ANDROID__) || defined(HOST_BUILD) diff --git a/android-emu/android/base/Tracing.h b/android-emu/aemu/base/Tracing.h index e13d2021..e13d2021 100644 --- a/android-emu/android/base/Tracing.h +++ b/android-emu/aemu/base/Tracing.h diff --git a/android-emu/android/base/TypeTraits.h b/android-emu/aemu/base/TypeTraits.h index 9ab00603..9ab00603 100644 --- a/android-emu/android/base/TypeTraits.h +++ b/android-emu/aemu/base/TypeTraits.h diff --git a/android-emu/android/base/address_space.h b/android-emu/aemu/base/address_space.h index e7b43fd0..e7b43fd0 100644 --- a/android-emu/android/base/address_space.h +++ b/android-emu/aemu/base/address_space.h diff --git a/android-emu/android/base/containers/EntityManager.h b/android-emu/aemu/base/containers/EntityManager.h index 2099666e..39541b73 100644 --- a/android-emu/android/base/containers/EntityManager.h +++ b/android-emu/aemu/base/containers/EntityManager.h @@ -13,8 +13,8 @@ // limitations under the License. #pragma once -#include "android/base/containers/Lookup.h" -#include "android/base/Optional.h" +#include "aemu/base/containers/Lookup.h" +#include "aemu/base/Optional.h" #include <functional> #include <unordered_map> diff --git a/android-emu/android/base/containers/HybridComponentManager.h b/android-emu/aemu/base/containers/HybridComponentManager.h index 02c62249..0a242e05 100644 --- a/android-emu/android/base/containers/HybridComponentManager.h +++ b/android-emu/aemu/base/containers/HybridComponentManager.h @@ -13,8 +13,8 @@ // limitations under the License. #pragma once -#include "android/base/containers/Lookup.h" -#include "android/base/containers/EntityManager.h" +#include "aemu/base/containers/Lookup.h" +#include "aemu/base/containers/EntityManager.h" #include <unordered_map> diff --git a/android-emu/android/base/containers/Lookup.h b/android-emu/aemu/base/containers/Lookup.h index 80432863..7215c237 100644 --- a/android-emu/android/base/containers/Lookup.h +++ b/android-emu/aemu/base/containers/Lookup.h @@ -11,7 +11,7 @@ #pragma once -#include "android/base/TypeTraits.h" +#include "aemu/base/TypeTraits.h" #include <initializer_list> #include <set> diff --git a/android-emu/android/base/containers/SmallVector.h b/android-emu/aemu/base/containers/SmallVector.h index 92e2d275..80aa4086 100644 --- a/android-emu/android/base/containers/SmallVector.h +++ b/android-emu/aemu/base/containers/SmallVector.h @@ -14,7 +14,7 @@ #pragma once -#include "android/base/TypeTraits.h" +#include "aemu/base/TypeTraits.h" #include <algorithm> #include <initializer_list> diff --git a/android-emu/android/base/files/MemStream.cpp b/android-emu/aemu/base/files/MemStream.cpp index 8561694e..f2b09cea 100644 --- a/android-emu/android/base/files/MemStream.cpp +++ b/android-emu/aemu/base/files/MemStream.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/files/MemStream.h" +#include "aemu/base/files/MemStream.h" -#include "android/base/files/StreamSerializing.h" +#include "aemu/base/files/StreamSerializing.h" #include <algorithm> #include <utility> diff --git a/android-emu/android/base/files/MemStream.h b/android-emu/aemu/base/files/MemStream.h index 5c5b0f62..23780c76 100644 --- a/android-emu/android/base/files/MemStream.h +++ b/android-emu/aemu/base/files/MemStream.h @@ -14,8 +14,8 @@ #pragma once -#include "android/base/Compiler.h" -#include "android/base/files/Stream.h" +#include "aemu/base/Compiler.h" +#include "aemu/base/files/Stream.h" #include <vector> diff --git a/android-emu/android/base/files/Stream.cpp b/android-emu/aemu/base/files/Stream.cpp index 6de638ab..7dcb4c9f 100644 --- a/android-emu/android/base/files/Stream.cpp +++ b/android-emu/aemu/base/files/Stream.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/files/Stream.h" +#include "aemu/base/files/Stream.h" #include <assert.h> #include <string.h> diff --git a/android-emu/android/base/files/Stream.h b/android-emu/aemu/base/files/Stream.h index a934bb90..a934bb90 100644 --- a/android-emu/android/base/files/Stream.h +++ b/android-emu/aemu/base/files/Stream.h diff --git a/android-emu/android/base/files/StreamSerializing.cpp b/android-emu/aemu/base/files/StreamSerializing.cpp index d88a1fc1..92d7b2e9 100644 --- a/android-emu/android/base/files/StreamSerializing.cpp +++ b/android-emu/aemu/base/files/StreamSerializing.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/files/StreamSerializing.h" +#include "aemu/base/files/StreamSerializing.h" namespace android { namespace base { diff --git a/android-emu/android/base/files/StreamSerializing.h b/android-emu/aemu/base/files/StreamSerializing.h index b8e91bca..2cf7d449 100644 --- a/android-emu/android/base/files/StreamSerializing.h +++ b/android-emu/aemu/base/files/StreamSerializing.h @@ -14,10 +14,10 @@ #pragma once -#include "android/base/containers/SmallVector.h" -#include "android/base/files/MemStream.h" -#include "android/base/files/Stream.h" -#include "android/base/TypeTraits.h" +#include "aemu/base/containers/SmallVector.h" +#include "aemu/base/files/MemStream.h" +#include "aemu/base/files/Stream.h" +#include "aemu/base/TypeTraits.h" #include <string> #include <vector> diff --git a/android-emu/android/base/fit/Defer.h b/android-emu/aemu/base/fit/Defer.h index d120c322..d120c322 100644 --- a/android-emu/android/base/fit/Defer.h +++ b/android-emu/aemu/base/fit/Defer.h diff --git a/android-emu/android/base/fit/Function.h b/android-emu/aemu/base/fit/Function.h index 4f4b17da..4f4b17da 100644 --- a/android-emu/android/base/fit/Function.h +++ b/android-emu/aemu/base/fit/Function.h diff --git a/android-emu/android/base/fit/FunctionInternal.h b/android-emu/aemu/base/fit/FunctionInternal.h index 3fb1ac53..3fb1ac53 100644 --- a/android-emu/android/base/fit/FunctionInternal.h +++ b/android-emu/aemu/base/fit/FunctionInternal.h diff --git a/android-emu/android/base/fit/Nullable.h b/android-emu/aemu/base/fit/Nullable.h index e05021bb..e05021bb 100644 --- a/android-emu/android/base/fit/Nullable.h +++ b/android-emu/aemu/base/fit/Nullable.h diff --git a/android-emu/android/base/fit/README b/android-emu/aemu/base/fit/README index 4b3eeebe..4b3eeebe 100644 --- a/android-emu/android/base/fit/README +++ b/android-emu/aemu/base/fit/README diff --git a/android-emu/android/base/fit/ThreadChecker.h b/android-emu/aemu/base/fit/ThreadChecker.h index 3859ecf1..3859ecf1 100644 --- a/android-emu/android/base/fit/ThreadChecker.h +++ b/android-emu/aemu/base/fit/ThreadChecker.h diff --git a/android-emu/android/base/fit/ThreadSafety.h b/android-emu/aemu/base/fit/ThreadSafety.h index bce528e4..bce528e4 100644 --- a/android-emu/android/base/fit/ThreadSafety.h +++ b/android-emu/aemu/base/fit/ThreadSafety.h diff --git a/android-emu/android/base/fit/UtilityInternal.h b/android-emu/aemu/base/fit/UtilityInternal.h index 274105e0..274105e0 100644 --- a/android-emu/android/base/fit/UtilityInternal.h +++ b/android-emu/aemu/base/fit/UtilityInternal.h diff --git a/android-emu/android/base/meson.build b/android-emu/aemu/base/meson.build index ef56eace..ef56eace 100644 --- a/android-emu/android/base/meson.build +++ b/android-emu/aemu/base/meson.build diff --git a/android-emu/android/base/ring_buffer.c b/android-emu/aemu/base/ring_buffer.c index d9dfafa5..bb12411c 100644 --- a/android-emu/android/base/ring_buffer.c +++ b/android-emu/aemu/base/ring_buffer.c @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/ring_buffer.h" +#include "aemu/base/ring_buffer.h" #include <errno.h> #include <string.h> diff --git a/android-emu/android/base/ring_buffer.h b/android-emu/aemu/base/ring_buffer.h index 7cc56ad2..7cc56ad2 100644 --- a/android-emu/android/base/ring_buffer.h +++ b/android-emu/aemu/base/ring_buffer.h diff --git a/android-emu/android/base/synchronization/AndroidConditionVariable.h b/android-emu/aemu/base/synchronization/AndroidConditionVariable.h index b6ef088c..ce96d82e 100644 --- a/android-emu/android/base/synchronization/AndroidConditionVariable.h +++ b/android-emu/aemu/base/synchronization/AndroidConditionVariable.h @@ -14,8 +14,8 @@ #pragma once -#include "android/base/Compiler.h" -#include "android/base/synchronization/AndroidLock.h" +#include "aemu/base/Compiler.h" +#include "aemu/base/synchronization/AndroidLock.h" #ifdef _WIN32 #include <windows.h> diff --git a/android-emu/android/base/synchronization/AndroidLock.h b/android-emu/aemu/base/synchronization/AndroidLock.h index 7b567f2c..e1f39abe 100644 --- a/android-emu/android/base/synchronization/AndroidLock.h +++ b/android-emu/aemu/base/synchronization/AndroidLock.h @@ -14,7 +14,7 @@ #pragma once -#include "android/base/Compiler.h" +#include "aemu/base/Compiler.h" #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN 1 diff --git a/android-emu/android/base/synchronization/AndroidMessageChannel.cpp b/android-emu/aemu/base/synchronization/AndroidMessageChannel.cpp index 87d86f80..162a7302 100644 --- a/android-emu/android/base/synchronization/AndroidMessageChannel.cpp +++ b/android-emu/aemu/base/synchronization/AndroidMessageChannel.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/synchronization/AndroidMessageChannel.h" +#include "aemu/base/synchronization/AndroidMessageChannel.h" namespace android { namespace base { diff --git a/android-emu/android/base/synchronization/AndroidMessageChannel.h b/android-emu/aemu/base/synchronization/AndroidMessageChannel.h index 1d5d2de1..9b93d4d0 100644 --- a/android-emu/android/base/synchronization/AndroidMessageChannel.h +++ b/android-emu/aemu/base/synchronization/AndroidMessageChannel.h @@ -14,9 +14,9 @@ #pragma once -#include "android/base/Optional.h" -#include "android/base/synchronization/AndroidConditionVariable.h" -#include "android/base/synchronization/AndroidLock.h" +#include "aemu/base/Optional.h" +#include "aemu/base/synchronization/AndroidConditionVariable.h" +#include "aemu/base/synchronization/AndroidLock.h" #include <utility> #include <stddef.h> diff --git a/android-emu/android/base/threads/AndroidFunctorThread.cpp b/android-emu/aemu/base/threads/AndroidFunctorThread.cpp index 025f0d88..80829d28 100644 --- a/android-emu/android/base/threads/AndroidFunctorThread.cpp +++ b/android-emu/aemu/base/threads/AndroidFunctorThread.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/threads/AndroidFunctorThread.h" +#include "aemu/base/threads/AndroidFunctorThread.h" #include <assert.h> diff --git a/android-emu/android/base/threads/AndroidFunctorThread.h b/android-emu/aemu/base/threads/AndroidFunctorThread.h index 5b88cb4a..9363b752 100644 --- a/android-emu/android/base/threads/AndroidFunctorThread.h +++ b/android-emu/aemu/base/threads/AndroidFunctorThread.h @@ -14,9 +14,9 @@ #pragma once -#include "android/base/TypeTraits.h" -#include "android/base/threads/AndroidThread.h" -#include "android/base/threads/AndroidThreadTypes.h" +#include "aemu/base/TypeTraits.h" +#include "aemu/base/threads/AndroidThread.h" +#include "aemu/base/threads/AndroidThreadTypes.h" #include <utility> diff --git a/android-emu/android/base/threads/AndroidThread.h b/android-emu/aemu/base/threads/AndroidThread.h index 19163787..5546fd43 100644 --- a/android-emu/android/base/threads/AndroidThread.h +++ b/android-emu/aemu/base/threads/AndroidThread.h @@ -14,9 +14,9 @@ #pragma once -#include "android/base/Compiler.h" -#include "android/base/threads/AndroidThreadTypes.h" -#include "android/base/synchronization/AndroidLock.h" +#include "aemu/base/Compiler.h" +#include "aemu/base/threads/AndroidThreadTypes.h" +#include "aemu/base/synchronization/AndroidLock.h" #ifdef _WIN32 #include <windows.h> diff --git a/android-emu/android/base/threads/AndroidThreadStore.cpp b/android-emu/aemu/base/threads/AndroidThreadStore.cpp index f5278db8..cb8a100f 100644 --- a/android-emu/android/base/threads/AndroidThreadStore.cpp +++ b/android-emu/aemu/base/threads/AndroidThreadStore.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/threads/AndroidThreadStore.h" +#include "aemu/base/threads/AndroidThreadStore.h" #ifdef _WIN32 -#include "android/base/memory/LazyInstance.h" +#include "aemu/base/memory/LazyInstance.h" #endif #include <errno.h> diff --git a/android-emu/android/base/threads/AndroidThreadStore.h b/android-emu/aemu/base/threads/AndroidThreadStore.h index 9636aeee..147c313a 100644 --- a/android-emu/android/base/threads/AndroidThreadStore.h +++ b/android-emu/aemu/base/threads/AndroidThreadStore.h @@ -14,7 +14,7 @@ #pragma once -#include "android/base/Compiler.h" +#include "aemu/base/Compiler.h" #ifdef _WIN32 # define WIN32_LEAN_AND_MEAN 1 diff --git a/android-emu/android/base/threads/AndroidThreadTypes.h b/android-emu/aemu/base/threads/AndroidThreadTypes.h index 26dcf25e..890c0458 100644 --- a/android-emu/android/base/threads/AndroidThreadTypes.h +++ b/android-emu/aemu/base/threads/AndroidThreadTypes.h @@ -14,7 +14,7 @@ #pragma once -#include "android/base/EnumFlags.h" +#include "aemu/base/EnumFlags.h" #include <functional> #include <stdint.h> diff --git a/android-emu/android/base/threads/AndroidThread_pthread.cpp b/android-emu/aemu/base/threads/AndroidThread_pthread.cpp index 8a0ecf0e..9d1bfc6a 100644 --- a/android-emu/android/base/threads/AndroidThread_pthread.cpp +++ b/android-emu/aemu/base/threads/AndroidThread_pthread.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/threads/AndroidThread.h" +#include "aemu/base/threads/AndroidThread.h" -#include "android/base/threads/AndroidThreadStore.h" +#include "aemu/base/threads/AndroidThreadStore.h" #include <log/log.h> #include <assert.h> diff --git a/android-emu/android/base/threads/AndroidWorkPool.cpp b/android-emu/aemu/base/threads/AndroidWorkPool.cpp index 7b841b25..b5baa418 100644 --- a/android-emu/android/base/threads/AndroidWorkPool.cpp +++ b/android-emu/aemu/base/threads/AndroidWorkPool.cpp @@ -12,12 +12,12 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "android/base/threads/AndroidWorkPool.h" +#include "aemu/base/threads/AndroidWorkPool.h" -#include "android/base/threads/AndroidFunctorThread.h" -#include "android/base/synchronization/AndroidLock.h" -#include "android/base/synchronization/AndroidConditionVariable.h" -#include "android/base/synchronization/AndroidMessageChannel.h" +#include "aemu/base/threads/AndroidFunctorThread.h" +#include "aemu/base/synchronization/AndroidLock.h" +#include "aemu/base/synchronization/AndroidConditionVariable.h" +#include "aemu/base/synchronization/AndroidMessageChannel.h" #include <atomic> #include <memory> diff --git a/android-emu/android/base/threads/AndroidWorkPool.h b/android-emu/aemu/base/threads/AndroidWorkPool.h index 5ffaecbf..5ffaecbf 100644 --- a/android-emu/android/base/threads/AndroidWorkPool.h +++ b/android-emu/aemu/base/threads/AndroidWorkPool.h diff --git a/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl b/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl index 3568c761..ebf2538d 100644 --- a/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl +++ b/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl @@ -27,7 +27,7 @@ #include <zircon/syscalls/object.h> #include "goldfish_address_space.h" -#include "android/base/synchronization/AndroidLock.h" +#include "aemu/base/synchronization/AndroidLock.h" #include "services/service_connector.h" #include <unordered_map> diff --git a/shared/OpenglCodecCommon/StateTrackingSupport.h b/shared/OpenglCodecCommon/StateTrackingSupport.h index 6ed8460b..69799443 100644 --- a/shared/OpenglCodecCommon/StateTrackingSupport.h +++ b/shared/OpenglCodecCommon/StateTrackingSupport.h @@ -16,8 +16,8 @@ #ifndef _STATE_TRACKING_SUPPORT_H_ #define _STATE_TRACKING_SUPPORT_H_ -#include "android/base/containers/HybridComponentManager.h" -#include "android/base/synchronization/AndroidLock.h" +#include "aemu/base/containers/HybridComponentManager.h" +#include "aemu/base/synchronization/AndroidLock.h" #include <GLES2/gl2.h> #include <memory> diff --git a/shared/OpenglCodecCommon/TextureSharedData.h b/shared/OpenglCodecCommon/TextureSharedData.h index fafb4350..fd927a0c 100644 --- a/shared/OpenglCodecCommon/TextureSharedData.h +++ b/shared/OpenglCodecCommon/TextureSharedData.h @@ -20,7 +20,7 @@ #include <map> #include <memory> -#include "android/base/synchronization/AndroidLock.h" +#include "aemu/base/synchronization/AndroidLock.h" using android::base::guest::ReadWriteLock; diff --git a/system/GLESv1_enc/gl_enc.cpp b/system/GLESv1_enc/gl_enc.cpp index bfc93e11..ffa01a8c 100644 --- a/system/GLESv1_enc/gl_enc.cpp +++ b/system/GLESv1_enc/gl_enc.cpp @@ -12,7 +12,7 @@ #include <stdio.h> -#include "android/base/Tracing.h" +#include "aemu/base/Tracing.h" #include "EncoderDebug.h" diff --git a/system/GLESv2_enc/gl2_enc.cpp b/system/GLESv2_enc/gl2_enc.cpp index 6be6864f..79787320 100644 --- a/system/GLESv2_enc/gl2_enc.cpp +++ b/system/GLESv2_enc/gl2_enc.cpp @@ -12,7 +12,7 @@ #include <stdio.h> -#include "android/base/Tracing.h" +#include "aemu/base/Tracing.h" #include "EncoderDebug.h" diff --git a/system/OpenglSystemCommon/AddressSpaceStream.cpp b/system/OpenglSystemCommon/AddressSpaceStream.cpp index 48f5227c..23995df3 100644 --- a/system/OpenglSystemCommon/AddressSpaceStream.cpp +++ b/system/OpenglSystemCommon/AddressSpaceStream.cpp @@ -16,7 +16,7 @@ #include "AddressSpaceStream.h" #include "VirtGpu.h" -#include "android/base/Tracing.h" +#include "aemu/base/Tracing.h" #include "virtgpu_gfxstream_protocol.h" #if PLATFORM_SDK_VERSION < 26 diff --git a/system/OpenglSystemCommon/AddressSpaceStream.h b/system/OpenglSystemCommon/AddressSpaceStream.h index da15dbcb..fe85df60 100644 --- a/system/OpenglSystemCommon/AddressSpaceStream.h +++ b/system/OpenglSystemCommon/AddressSpaceStream.h @@ -19,7 +19,7 @@ #include "IOStream.h" #include "VirtGpu.h" #include "address_space_graphics_types.h" -#include "android/base/AndroidHealthMonitor.h" +#include "aemu/base/AndroidHealthMonitor.h" #include "goldfish_address_space.h" using android::base::guest::HealthMonitor; diff --git a/system/OpenglSystemCommon/HostConnection.cpp b/system/OpenglSystemCommon/HostConnection.cpp index 0430447b..08ab2755 100644 --- a/system/OpenglSystemCommon/HostConnection.cpp +++ b/system/OpenglSystemCommon/HostConnection.cpp @@ -15,16 +15,16 @@ */ #include "HostConnection.h" -#include "android/base/threads/AndroidThread.h" -#include "android/base/AndroidHealthMonitor.h" -#include "android/base/AndroidHealthMonitorConsumerBasic.h" +#include "aemu/base/threads/AndroidThread.h" +#include "aemu/base/AndroidHealthMonitor.h" +#include "aemu/base/AndroidHealthMonitorConsumerBasic.h" #include "cutils/properties.h" #include "renderControl_types.h" #ifdef HOST_BUILD -#include "android/base/Tracing.h" +#include "aemu/base/Tracing.h" #endif -#include "android/base/Process.h" +#include "aemu/base/Process.h" #define DEBUG_HOSTCONNECTION 0 diff --git a/system/OpenglSystemCommon/address_space_graphics_types.h b/system/OpenglSystemCommon/address_space_graphics_types.h index 7f724c95..de3f49f5 100644 --- a/system/OpenglSystemCommon/address_space_graphics_types.h +++ b/system/OpenglSystemCommon/address_space_graphics_types.h @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "android/base/ring_buffer.h" +#include "aemu/base/ring_buffer.h" #include <functional> #include <cstddef> diff --git a/system/egl/egl.cpp b/system/egl/egl.cpp index 4dd10a48..cc31186a 100644 --- a/system/egl/egl.cpp +++ b/system/egl/egl.cpp @@ -23,7 +23,7 @@ #include "HostConnection.h" #include "ThreadInfo.h" -#include "android/base/threads/AndroidThread.h" +#include "aemu/base/threads/AndroidThread.h" #include "eglDisplay.h" #include "eglSync.h" #include "egl_ftable.h" @@ -58,7 +58,7 @@ #endif // VIRTIO_GPU #ifdef GFXSTREAM -#include "android/base/Tracing.h" +#include "aemu/base/Tracing.h" #endif #include <cutils/trace.h> diff --git a/system/gralloc/gralloc_old.cpp b/system/gralloc/gralloc_old.cpp index f1e5f0e1..d742ef76 100644 --- a/system/gralloc/gralloc_old.cpp +++ b/system/gralloc/gralloc_old.cpp @@ -29,7 +29,7 @@ #include "HostConnection.h" #include "ProcessPipe.h" #include "ThreadInfo.h" -#include "android/base/threads/AndroidThread.h" +#include "aemu/base/threads/AndroidThread.h" #include "glUtils.h" #include "goldfish_address_space.h" #include "goldfish_dma.h" diff --git a/system/hals/mapper3.cpp b/system/hals/mapper3.cpp index 6e3a664a..58c0f69a 100644 --- a/system/hals/mapper3.cpp +++ b/system/hals/mapper3.cpp @@ -23,7 +23,7 @@ #include "FormatConversions.h" #include "debug.h" -#include "android/base/Tracing.h" +#include "aemu/base/Tracing.h" #define ATRACE_TAG ATRACE_TAG_GRAPHICS diff --git a/system/hwc2/DrmPresenter.h b/system/hwc2/DrmPresenter.h index 5ef37249..d42fbf77 100644 --- a/system/hwc2/DrmPresenter.h +++ b/system/hwc2/DrmPresenter.h @@ -29,7 +29,7 @@ #include "Common.h" #include "LruCache.h" -#include "android/base/synchronization/AndroidLock.h" +#include "aemu/base/synchronization/AndroidLock.h" namespace android { diff --git a/system/hwc3/DrmClient.h b/system/hwc3/DrmClient.h index 0f0dafd3..7919cbfb 100644 --- a/system/hwc3/DrmClient.h +++ b/system/hwc3/DrmClient.h @@ -34,7 +34,7 @@ #include "DrmPlane.h" #include "DrmProperty.h" #include "LruCache.h" -#include "android/base/synchronization/AndroidLock.h" +#include "aemu/base/synchronization/AndroidLock.h" namespace aidl::android::hardware::graphics::composer3::impl { diff --git a/system/renderControl_enc/renderControl_enc.cpp b/system/renderControl_enc/renderControl_enc.cpp index 3d3dc7e0..04fe484b 100644 --- a/system/renderControl_enc/renderControl_enc.cpp +++ b/system/renderControl_enc/renderControl_enc.cpp @@ -12,7 +12,7 @@ #include <stdio.h> -#include "android/base/Tracing.h" +#include "aemu/base/Tracing.h" #include "EncoderDebug.h" diff --git a/system/vulkan_enc/DescriptorSetVirtualization.h b/system/vulkan_enc/DescriptorSetVirtualization.h index 7c7b1f64..ecb6c483 100644 --- a/system/vulkan_enc/DescriptorSetVirtualization.h +++ b/system/vulkan_enc/DescriptorSetVirtualization.h @@ -14,7 +14,7 @@ // limitations under the License. #pragma once -#include "android/base/containers/EntityManager.h" +#include "aemu/base/containers/EntityManager.h" #include <vulkan/vulkan.h> diff --git a/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp b/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp index d3c4e028..57071700 100644 --- a/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp +++ b/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp @@ -22,7 +22,7 @@ #include "ResourceTracker.h" #include "Resources.h" #include "VkEncoder.h" -#include "android/base/AndroidSubAllocator.h" +#include "aemu/base/AndroidSubAllocator.h" using android::base::guest::SubAllocator; diff --git a/system/vulkan_enc/HostVisibleMemoryVirtualization.h b/system/vulkan_enc/HostVisibleMemoryVirtualization.h index 6ec9427e..272e51a9 100644 --- a/system/vulkan_enc/HostVisibleMemoryVirtualization.h +++ b/system/vulkan_enc/HostVisibleMemoryVirtualization.h @@ -16,7 +16,7 @@ #include <vulkan/vulkan.h> -#include "android/base/AndroidSubAllocator.h" +#include "aemu/base/AndroidSubAllocator.h" #include "goldfish_address_space.h" constexpr uint64_t kMegaBtye = 1048576; diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp index 116ce74a..a7a1c12f 100644 --- a/system/vulkan_enc/ResourceTracker.cpp +++ b/system/vulkan_enc/ResourceTracker.cpp @@ -19,9 +19,9 @@ #include "CommandBufferStagingStream.h" #include "DescriptorSetVirtualization.h" -#include "android/base/Optional.h" -#include "android/base/threads/AndroidWorkPool.h" -#include "android/base/Tracing.h" +#include "aemu/base/Optional.h" +#include "aemu/base/threads/AndroidWorkPool.h" +#include "aemu/base/Tracing.h" #include "goldfish_vk_private_defs.h" @@ -84,8 +84,8 @@ void zx_event_create(int, zx_handle_t*) { } #include "Resources.h" #include "VkEncoder.h" -#include "android/base/AlignedBuf.h" -#include "android/base/synchronization/AndroidLock.h" +#include "aemu/base/AlignedBuf.h" +#include "aemu/base/synchronization/AndroidLock.h" #include "virtgpu_gfxstream_protocol.h" #include "goldfish_address_space.h" diff --git a/system/vulkan_enc/ResourceTracker.h b/system/vulkan_enc/ResourceTracker.h index 5d1891e3..391eac5e 100644 --- a/system/vulkan_enc/ResourceTracker.h +++ b/system/vulkan_enc/ResourceTracker.h @@ -14,7 +14,7 @@ // limitations under the License. #pragma once -#include "android/base/Tracing.h" +#include "aemu/base/Tracing.h" #include <vulkan/vulkan.h> diff --git a/system/vulkan_enc/VkEncoder.cpp b/system/vulkan_enc/VkEncoder.cpp index 48a757d2..48d0adef 100644 --- a/system/vulkan_enc/VkEncoder.cpp +++ b/system/vulkan_enc/VkEncoder.cpp @@ -45,9 +45,9 @@ #include "Resources.h" #include "Validation.h" #include "VulkanStreamGuest.h" -#include "android/base/AlignedBuf.h" -#include "android/base/BumpPool.h" -#include "android/base/synchronization/AndroidLock.h" +#include "aemu/base/AlignedBuf.h" +#include "aemu/base/BumpPool.h" +#include "aemu/base/synchronization/AndroidLock.h" #include "goldfish_vk_counting_guest.h" #include "goldfish_vk_deepcopy_guest.h" #include "goldfish_vk_handlemap_guest.h" diff --git a/system/vulkan_enc/VkEncoder.h b/system/vulkan_enc/VkEncoder.h index 1283d359..d89c2ab5 100644 --- a/system/vulkan_enc/VkEncoder.h +++ b/system/vulkan_enc/VkEncoder.h @@ -33,7 +33,7 @@ #include <memory> -#include "android/base/AndroidHealthMonitor.h" +#include "aemu/base/AndroidHealthMonitor.h" #include "goldfish_vk_private_defs.h" #include "vulkan_gfxstream.h" class IOStream; diff --git a/system/vulkan_enc/VulkanStreamGuest.h b/system/vulkan_enc/VulkanStreamGuest.h index 6d2dac1a..fd738802 100644 --- a/system/vulkan_enc/VulkanStreamGuest.h +++ b/system/vulkan_enc/VulkanStreamGuest.h @@ -13,8 +13,8 @@ // limitations under the License. #pragma once -#include "android/base/files/Stream.h" -#include "android/base/files/StreamSerializing.h" +#include "aemu/base/files/Stream.h" +#include "aemu/base/files/StreamSerializing.h" #include "goldfish_vk_private_defs.h" @@ -23,8 +23,8 @@ #include "IOStream.h" #include "ResourceTracker.h" -#include "android/base/BumpPool.h" -#include "android/base/Tracing.h" +#include "aemu/base/BumpPool.h" +#include "aemu/base/Tracing.h" #include <vector> #include <memory> diff --git a/system/vulkan_enc/goldfish_vk_deepcopy_guest.h b/system/vulkan_enc/goldfish_vk_deepcopy_guest.h index 5bdd148b..2c59e5bc 100644 --- a/system/vulkan_enc/goldfish_vk_deepcopy_guest.h +++ b/system/vulkan_enc/goldfish_vk_deepcopy_guest.h @@ -31,7 +31,7 @@ #pragma once #include <vulkan/vulkan.h> -#include "android/base/BumpPool.h" +#include "aemu/base/BumpPool.h" #include "goldfish_vk_private_defs.h" #include "vk_platform_compat.h" #include "vulkan_gfxstream.h" diff --git a/system/vulkan_enc/vulkan_enc_unittests.cpp b/system/vulkan_enc/vulkan_enc_unittests.cpp index 744ea31c..693dbcd3 100644 --- a/system/vulkan_enc/vulkan_enc_unittests.cpp +++ b/system/vulkan_enc/vulkan_enc_unittests.cpp @@ -14,9 +14,9 @@ // limitations under the License. #include <gtest/gtest.h> -#include "android/base/synchronization/AndroidConditionVariable.h" -#include "android/base/synchronization/AndroidLock.h" -#include "android/base/threads/AndroidWorkPool.h" +#include "aemu/base/synchronization/AndroidConditionVariable.h" +#include "aemu/base/synchronization/AndroidLock.h" +#include "aemu/base/threads/AndroidWorkPool.h" #include <atomic> #include <vector> |