Merge "Fix Mac build." am: 478d0698bb am: bf5c501453 am: 99231262e2

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1622119

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80de7ee910d5f500c4639c1b8eb5dcff0d22b53b
This commit is contained in:
Alistair Delva 2021-03-07 00:31:01 +00:00 committed by Automerger Merge Worker
commit 464198a4cb

View file

@ -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",