Allow including file_descriptor.h in fs_mgr.
Note that file_descriptor.h includes base/logging.h, which conflicts
with android-base/logging.h. Since it doesn't actually need this header,
change it to base/macros.h which is safe.
Bug: 168554689
Test: builds
Change-Id: I1e903cec857c50f988b537d87c1f254338da686c
diff --git a/Android.bp b/Android.bp
index a8b5fc2..6585ea2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -755,6 +755,15 @@
export_include_dirs: ["."],
apex_available: [
"com.android.gki.*",
+ "//apex_available:platform",
],
host_supported: true,
+ recovery_available: true,
+ ramdisk_available: true,
+
+ target: {
+ darwin: {
+ enabled: false,
+ },
+ }
}
diff --git a/payload_consumer/fec_file_descriptor.cc b/payload_consumer/fec_file_descriptor.cc
index de22cf3..3fee196 100644
--- a/payload_consumer/fec_file_descriptor.cc
+++ b/payload_consumer/fec_file_descriptor.cc
@@ -16,6 +16,8 @@
#include "update_engine/payload_consumer/fec_file_descriptor.h"
+#include <base/logging.h>
+
namespace chromeos_update_engine {
bool FecFileDescriptor::Open(const char* path, int flags) {
diff --git a/payload_consumer/file_descriptor.h b/payload_consumer/file_descriptor.h
index 55f76c6..fb07ff0 100644
--- a/payload_consumer/file_descriptor.h
+++ b/payload_consumer/file_descriptor.h
@@ -21,7 +21,7 @@
#include <sys/types.h>
#include <memory>
-#include <base/logging.h>
+#include <base/macros.h>
// Abstraction for managing opening, reading, writing and closing of file
// descriptors. This includes an abstract class and one standard implementation