Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99231262 authored by Alistair Delva's avatar Alistair Delva Committed by Automerger Merge Worker
Browse files

Merge "Fix Mac build." am: 478d0698 am: bf5c5014

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10fe1d2ec31dba83fb9e07c283d69c3090ad86c6
parents 7885c54b bf5c5014
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -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",