From 66bfb9adac2798ccdb341a0ad328836761cf4bcb Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 5 Mar 2021 17:58:28 -0800 Subject: [PATCH] Fix Mac build. The Mac doesn't need fs_config (there's a `darwin: { enabled: false } }` at the only caller), so stop trying to build it here rather than fix it so it builds again. Test: treehugger Change-Id: I88d6b3a44b1ab823a419789d8545fcf10061079c --- libcutils/Android.bp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libcutils/Android.bp b/libcutils/Android.bp index 0d9f2c79a..b38818a4b 100644 --- a/libcutils/Android.bp +++ b/libcutils/Android.bp @@ -170,10 +170,14 @@ cc_library { 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 @@ cc_library { srcs: libcutils_nonwindows_sources + [ "android_reboot.cpp", "ashmem-dev.cpp", - "fs_config.cpp", "klog.cpp", "partition_utils.cpp", "qtaguid.cpp",