Merge "Fix Mac build." am: 478d0698bb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If503716832a7c675712aafbd7bf5c76c304ad337
This commit is contained in:
Alistair Delva 2021-03-06 23:32:35 +00:00 committed by Automerger Merge Worker
commit bf5c501453

View file

@ -170,10 +170,14 @@ cc_library {
linux_bionic: { linux_bionic: {
enabled: true, enabled: true,
}, },
linux: {
srcs: [
"fs_config.cpp",
],
},
not_windows: { not_windows: {
srcs: libcutils_nonwindows_sources + [ srcs: libcutils_nonwindows_sources + [
"ashmem-host.cpp", "ashmem-host.cpp",
"fs_config.cpp",
"trace-host.cpp", "trace-host.cpp",
], ],
}, },
@ -193,7 +197,6 @@ cc_library {
srcs: libcutils_nonwindows_sources + [ srcs: libcutils_nonwindows_sources + [
"android_reboot.cpp", "android_reboot.cpp",
"ashmem-dev.cpp", "ashmem-dev.cpp",
"fs_config.cpp",
"klog.cpp", "klog.cpp",
"partition_utils.cpp", "partition_utils.cpp",
"qtaguid.cpp", "qtaguid.cpp",