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

Commit d723ab37 authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "Really fix Mac build." am: f0e39a9d am: f1a21e9d am: 4e398ac0 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24bd6ec1dcd1a76d5c87f7de26c228a73c0c616d
parents a9e1571a 4e398ac0

libcutils/Android.bp

+2 −5
Original line number Diff line number Diff line
@@ -170,14 +170,10 @@ 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",

            ],

        },
@@ -197,6 +193,7 @@ cc_library { 
            srcs: libcutils_nonwindows_sources + [

                "android_reboot.cpp",

                "ashmem-dev.cpp",

                "fs_config.cpp",

                "klog.cpp",

                "partition_utils.cpp",

                "qtaguid.cpp",

libcutils/fs_config.cpp

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <string>



#include <android-base/strings.h>

#include <cutils/fs.h>

#include <log/log.h>

#include <private/android_filesystem_config.h>