android/base -> aemu/base refactor.
Bug: 237805597
Test: presubmit
Change-Id: I9b8eafe998ef433fdac9a7614c710563e3460cba
diff --git a/system/GLESv1_enc/gl_enc.cpp b/system/GLESv1_enc/gl_enc.cpp
index bfc93e1..ffa01a8 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 6be6864..7978732 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 48f5227..23995df 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 da15dbc..fe85df6 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 0430447..08ab275 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 7f724c9..de3f49f 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 4dd10a4..cc31186 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 f1e5f0e..d742ef7 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 6e3a664..58c0f69 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 5ef3724..d42fbf7 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 0f0dafd..7919cbf 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 3d3dc7e..04fe484 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 7c7b1f6..ecb6c48 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 d3c4e02..5707170 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 6ec9427..272e51a 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 116ce74..a7a1c12 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 @@
#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 5d1891e..391eac5 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 48a757d..48d0ade 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 1283d35..d89c2ab 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 6d2dac1..fd73880 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 5bdd148..2c59e5b 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 744ea31..693dbcd 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>
