commit 1614c1e9ceca8ce5bb183c3f96274b0c8a9e355b
author Isaac Chen <ycchen@google.com> Tue Feb 21 18:10:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 21 18:10:32 2017 +0000
tree f6a2e2c7979d62785d7b0920f4e40b77cf50bdca
parent 1dc50630e28d51ce51d710fb79197bf3ac0312d3
parent eb8be8f5e92a5562b212ed258a9a6a16063814c8

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

Change-Id: I9624618aae00134414e946e3f6df97e89c5b7495

services/surfaceflinger/Android.mk

diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index ec47c8a..24c68ec 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -189,10 +189,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();