commit 478d0698bbe2a9faab2dc0cda6a75f75f4b2a939
author Alistair Delva <adelva@google.com> Sat Mar 06 23:04:18 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 06 23:04:18 2021 +0000
tree 7566f1c46da7cfd2edd009be2ecedef1d43838ca
parent fce8e0f4a4bf0847b95b8582e95d09efe454b9c4
parent 66bfb9adac2798ccdb341a0ad328836761cf4bcb

Merge "Fix Mac build."

libcutils/Android.bp

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