[aemu] Snapshot header consolidation. am: bb6fb6468c am: 95e62316a0 am: aebabc1e45 am: 1ee457afca am: 9c4fccc105 am: 1edd3c7d34
Original change: https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/2562071
Change-Id: I306e6019481775c0678f517fe704d5ba8968815d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
GitOrigin-RevId: 3e31564e5eabacb7a40974321b48d419b6aa2212
diff --git a/host-common/MediaVideoToolBoxUtils.cpp b/host-common/MediaVideoToolBoxUtils.cpp
index bfe2efa..23fd00a 100644
--- a/host-common/MediaVideoToolBoxUtils.cpp
+++ b/host-common/MediaVideoToolBoxUtils.cpp
@@ -13,7 +13,7 @@
// limitations under the License.
#include "host-common/MediaVideoToolBoxUtils.h"
-#include "OpenglRender/MediaNative.h"
+#include "render-utils/MediaNative.h"
#define MEDIA_VTB_DEBUG 0
diff --git a/host-common/MultiDisplayPipe.cpp b/host-common/MultiDisplayPipe.cpp
index 573a9da..922f9e0 100644
--- a/host-common/MultiDisplayPipe.cpp
+++ b/host-common/MultiDisplayPipe.cpp
@@ -16,7 +16,7 @@
#include "MultiDisplayPipe.h"
#include "MultiDisplay.h"
-#include "android/opengles.h"
+#include "host-common/opengles.h"
namespace android {
diff --git a/host-common/include/host-common/MediaHostRenderer.h b/host-common/include/host-common/MediaHostRenderer.h
index ee1ec49..a2146e2 100644
--- a/host-common/include/host-common/MediaHostRenderer.h
+++ b/host-common/include/host-common/MediaHostRenderer.h
@@ -16,7 +16,7 @@
#include "host-common/GoldfishMediaDefs.h"
#include "host-common/MediaTexturePool.h"
-#include "android/opengles.h"
+#include "host-common/opengles.h"
#include <stddef.h>
#include <stdint.h>
diff --git a/host-common/include/host-common/MediaTexturePool.h b/host-common/include/host-common/MediaTexturePool.h
index 8ee93ae..4f92251 100644
--- a/host-common/include/host-common/MediaTexturePool.h
+++ b/host-common/include/host-common/MediaTexturePool.h
@@ -15,7 +15,7 @@
#pragma once
#include "host-common/GoldfishMediaDefs.h"
-#include "android/opengles.h"
+#include "host-common/opengles.h"
#include <stddef.h>
#include <stdint.h>
diff --git a/snapshot/include/snapshot/common.h b/snapshot/include/snapshot/common.h
index 2dd1adc..bc4d3cf 100644
--- a/snapshot/include/snapshot/common.h
+++ b/snapshot/include/snapshot/common.h
@@ -23,7 +23,7 @@
#include <stdint.h>
struct SnapshotRamBlock {
- const char* id;
+ std::string id;
int64_t startOffset;
uint8_t* hostPtr;
int64_t totalSize;
diff --git a/snapshot/include/snapshot/interface.h b/snapshot/include/snapshot/interface.h
index 4a9f079..e83aa08 100644
--- a/snapshot/include/snapshot/interface.h
+++ b/snapshot/include/snapshot/interface.h
@@ -15,8 +15,14 @@
*/
#pragma once
+#include "aemu/base/c_header.h"
+
#include "host-common/vm_operations.h"
-// #include "host-common/window_agent.h"
+#include "host-common/window_agent.h"
+
+#ifndef USING_ANDROID_BP
+ANDROID_BEGIN_HEADER
+#endif
typedef enum {
SNAPSHOT_STATUS_NOT_STARTED,
@@ -26,8 +32,8 @@
SNAPSHOT_STATUS_CANCELED,
} AndroidSnapshotStatus;
-// void androidSnapshot_initialize(const QAndroidVmOperations* vmOperations,
-// const QAndroidEmulatorWindowAgent* windowAgent);
+void androidSnapshot_initialize(const QAndroidVmOperations* vmOperations,
+ const QAndroidEmulatorWindowAgent* windowAgent);
void androidSnapshot_setDiskSpaceCheck(bool enable);
void androidSnapshot_finalize();
@@ -110,3 +116,7 @@
bool androidSnapshot_isUsingHdd();
bool androidSnapshot_protoExists(const char* name);
+
+#ifndef USING_ANDROID_BP
+ANDROID_END_HEADER
+#endif
