commit 33f4b64f23978b99088a0afeee662bc211cc9f17
author Isaac Chen <ycchen@google.com> Tue Feb 21 17:52:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 21 17:52:35 2017 +0000
tree c4784db62068721446cf8d21002debc8b774ed21
parent 8d6362fc44636cff50aa97f2966daf96155bc43c
parent 52a60e08fb3c636b073a9b6a27672bbd3061e5b8

Merge "Removed build time variable ENABLE_CPUSETS."
am: 52a60e08fb

Change-Id: Ic5d351f18a0c839212987c5fcbb803a7c07ac5cb

services/surfaceflinger/Android.mk

diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 170faa8..be537dc 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -159,10 +159,6 @@
 
 LOCAL_INIT_RC := surfaceflinger.rc
 
-ifneq ($(ENABLE_CPUSETS),)
-    LOCAL_CFLAGS += -DENABLE_CPUSETS
-endif
-
 ifeq ($(TARGET_USES_HWC2),true)
     LOCAL_CFLAGS += -DUSE_HWC2
 endif

services/surfaceflinger/main_surfaceflinger.cpp

diff --git a/services/surfaceflinger/main_surfaceflinger.cpp b/services/surfaceflinger/main_surfaceflinger.cpp
index 53a63bd..f151087 100644
--- a/services/surfaceflinger/main_surfaceflinger.cpp
+++ b/services/surfaceflinger/main_surfaceflinger.cpp
@@ -45,12 +45,10 @@
 
     set_sched_policy(0, SP_FOREGROUND);
 
-#ifdef ENABLE_CPUSETS
     // Put most SurfaceFlinger threads in the system-background cpuset
     // Keeps us from unnecessarily using big cores
     // Do this after the binder thread pool init
-    set_cpuset_policy(0, SP_SYSTEM);
-#endif
+    if (cpusets_enabled()) set_cpuset_policy(0, SP_SYSTEM);
 
     // initialize before clients can connect
     flinger->init();