commit f0e39a9dfeb8f0dec308dcb10847a83cc66dd51c
author Neil Fuller <nfuller@google.com> Tue Mar 09 09:50:07 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 09 09:50:07 2021 +0000
tree 03fda94b95efd6430e2bfeb113fa5d9098c2f148
parent bc3dec4e8cdf5651cdf254cc956ea1bbab7088c4
parent 39d6c8eef8bf34415844fb474444ed100829e2df

Merge "Really fix Mac build."

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index b38818a..0d9f2c7 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -170,14 +170,10 @@
         linux_bionic: {
             enabled: true,
         },
-        linux: {
-            srcs: [
-                "fs_config.cpp",
-            ],
-        },
         not_windows: {
             srcs: libcutils_nonwindows_sources + [
                 "ashmem-host.cpp",
+                "fs_config.cpp",
                 "trace-host.cpp",
             ],
         },
@@ -197,6 +193,7 @@
             srcs: libcutils_nonwindows_sources + [
                 "android_reboot.cpp",
                 "ashmem-dev.cpp",
+                "fs_config.cpp",
                 "klog.cpp",
                 "partition_utils.cpp",
                 "qtaguid.cpp",

libcutils/fs_config.cpp

diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 54eeeac..d69c038 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -35,6 +35,7 @@
 #include <string>
 
 #include <android-base/strings.h>
+#include <cutils/fs.h>
 #include <log/log.h>
 #include <private/android_filesystem_config.h>