summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Chen <ycchen@google.com>2017-02-21 02:05:22 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-02-21 02:05:23 +0000
commit52a60e08fb3c636b073a9b6a27672bbd3061e5b8 (patch)
tree5e47536d6d9233239a9739bb87eac78a6a69d24f
parent6481ebfbc36c7ef3d7e6e4809e802240eb0da297 (diff)
parent391ab069b114d5012b1fa0a48c9bc2b841974970 (diff)
downloadnative-52a60e08fb3c636b073a9b6a27672bbd3061e5b8.tar.gz
Merge "Removed build time variable ENABLE_CPUSETS."
-rw-r--r--services/surfaceflinger/Android.mk4
-rw-r--r--services/surfaceflinger/main_surfaceflinger.cpp4
2 files changed, 1 insertions, 7 deletions
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 170faa8139..be537dcc83 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -159,10 +159,6 @@ LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"
LOCAL_INIT_RC := surfaceflinger.rc
-ifneq ($(ENABLE_CPUSETS),)
- LOCAL_CFLAGS += -DENABLE_CPUSETS
-endif
-
ifeq ($(TARGET_USES_HWC2),true)
LOCAL_CFLAGS += -DUSE_HWC2
endif
diff --git a/services/surfaceflinger/main_surfaceflinger.cpp b/services/surfaceflinger/main_surfaceflinger.cpp
index 53a63bdd9b..f151087676 100644
--- a/services/surfaceflinger/main_surfaceflinger.cpp
+++ b/services/surfaceflinger/main_surfaceflinger.cpp
@@ -45,12 +45,10 @@ int main(int, char**) {
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();