commit 8188c0ca1b905abad32ab88b8e2e90f5e17ddad8
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 12 01:26:33 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 12 01:26:33 2024 +0000
tree 85ec5eb96acb079c1015b121a3a8f03189278a1b
parent fba50f9139225c976591a71cda796e06e4e5a33e
parent 92e5c8c96dde8cb0396edb5f4d620fd949c60786

Snap for 12488717 from 92e5c8c96dde8cb0396edb5f4d620fd949c60786 to 25Q1-release

Change-Id: I63df7d514f4288fc142d69a08f5bebf6b96f4305

payload_generator/ab_generator.h

diff --git a/payload_generator/ab_generator.h b/payload_generator/ab_generator.h
index 2accf1e..63a40e9 100644
--- a/payload_generator/ab_generator.h
+++ b/payload_generator/ab_generator.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <brillo/secure_blob.h>
 
 #include "update_engine/payload_consumer/payload_constants.h"

payload_generator/operations_generator.h

diff --git a/payload_generator/operations_generator.h b/payload_generator/operations_generator.h
index 4d7322b..c25173f 100644
--- a/payload_generator/operations_generator.h
+++ b/payload_generator/operations_generator.h
@@ -19,7 +19,7 @@
 
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "update_engine/payload_generator/annotated_operation.h"
 #include "update_engine/payload_generator/blob_file_writer.h"