commit 925ba190a98efe976d03df257ab9a95b5b7b967e
author Suren Baghdasaryan <surenb@google.com> Mon Feb 04 21:00:26 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Feb 04 21:00:26 2019 -0800
tree aff886f2ece736d6115aee15541bd2918b8f080f
parent 90d456f445d631c9b5438872d438407662938dfc
parent 53a7932b6c49718095b456b26057d7daf38b4590

Merge changes from topic "cgroup abstraction layer" am: faa6c4894d
am: e419456f89

Change-Id: I224b7782c83bffecea05eaffc1fce57193a51313

libprocessgroup/cgroup_map.cpp

diff --git a/libprocessgroup/cgroup_map.cpp b/libprocessgroup/cgroup_map.cpp
index 1b5f217..12cfb7e 100644
--- a/libprocessgroup/cgroup_map.cpp
+++ b/libprocessgroup/cgroup_map.cpp
@@ -142,6 +142,9 @@
     return true;
 }
 
+// To avoid issues in sdk_mac build
+#if defined(__ANDROID__)
+
 static bool SetupCgroup(const CgroupDescriptor& descriptor) {
     const CgroupController* controller = descriptor.controller();
 
@@ -180,6 +183,15 @@
     return true;
 }
 
+#else
+
+// Stubs for non-Android targets.
+static bool SetupCgroup(const CgroupDescriptor&) {
+    return false;
+}
+
+#endif
+
 static bool WriteRcFile(const std::map<std::string, CgroupDescriptor>& descriptors) {
     std::string cgroup_rc_path = StringPrintf("%s/%s", CGROUPS_RC_DIR, CgroupMap::CGROUPS_RC_FILE);
     unique_fd fd(TEMP_FAILURE_RETRY(open(cgroup_rc_path.c_str(),