summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsaac Chen2017-02-15 21:47:33 -0600
committerIsaac Chen2017-02-20 06:53:24 -0600
commit795267d4c74821cce884c6f1e1082f00e8e12c4a (patch)
treee1d55c69bd7842013ac0136255263c21400c347f /libcutils/Android.bp
parentdce4b65fe095efeab8e2ab2d1d319dc9a0626baa (diff)
downloadplatform-system-core-795267d4c74821cce884c6f1e1082f00e8e12c4a.tar.gz
platform-system-core-795267d4c74821cce884c6f1e1082f00e8e12c4a.tar.xz
platform-system-core-795267d4c74821cce884c6f1e1082f00e8e12c4a.zip
Removed cpusets/schedboost build time dependency.
These two Soong product_variables were usually controlled by ENABLE_CPUSETS and ENABLE_SCHEDBOOST in BoardConfig.mk. This change turns the build time variables into runtime decision by checking if a special file, "tasks", can be found under the mount points, /dev/cpuset and /dev/stune, for cpusets and schedboost, respectively. That special file only exists when the corresponding Linux kernel configurations, CONFIG_CPUSETS and CONFIG_SCHEDTUNE, are set. Bug: 34726944 Test: Tested on Sailfish with following configurations neither cpuset nor schedtune enabled in the kernel cpuset enabled, but schedtune disabled in the kernel both cpuset and schedtune enabled in the kernel Change-Id: I6695b8b32b2fecb4fd995018418bbe2edc5d590f
Diffstat (limited to 'libcutils/Android.bp')
-rw-r--r--libcutils/Android.bp10
1 files changed, 1 insertions, 9 deletions
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 8ba7452ef..cf3119590 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -60,7 +60,7 @@ cc_library {
60 "native_handle.c", 60 "native_handle.c",
61 "open_memstream.c", 61 "open_memstream.c",
62 "record_stream.c", 62 "record_stream.c",
63 "sched_policy.c", 63 "sched_policy.cpp",
64 "sockets.cpp", 64 "sockets.cpp",
65 "strdup16to8.c", 65 "strdup16to8.c",
66 "strdup8to16.c", 66 "strdup8to16.c",
@@ -141,14 +141,6 @@ cc_library {
141 header_libs: ["libcutils_headers"], 141 header_libs: ["libcutils_headers"],
142 export_header_lib_headers: ["libcutils_headers"], 142 export_header_lib_headers: ["libcutils_headers"],
143 143
144 product_variables: {
145 cpusets: {
146 cflags: ["-DUSE_CPUSETS"],
147 },
148 schedboost: {
149 cflags: ["-DUSE_SCHEDBOOST"],
150 },
151 },
152 cflags: [ 144 cflags: [
153 "-Werror", 145 "-Werror",
154 "-Wall", 146 "-Wall",