diff options
author | Elliott Hughes <enh@google.com> | 2017-06-29 03:15:03 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-29 03:15:03 +0000 |
commit | dd515b1dda9eb10eb60003419534c8ea0567bc6d (patch) | |
tree | 79e40b5e5b4d0f008418f673d0fb9cf736544121 | |
parent | 5f79bded8f76d9495a9c1be32f8a523e4461eb20 (diff) | |
parent | 761c9b2cc4d03deefe5625c4210f60f9916268ae (diff) | |
download | hikey-dd515b1dda9eb10eb60003419534c8ea0567bc6d.tar.gz |
resolve merge conflicts of 99d2e72 to stage-aosp-master
am: 761c9b2cc4
Change-Id: Iffdf6a26d2abd1afa915aca68a37974cfb81cbe3
-rw-r--r-- | BoardConfigCommon.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index e8a23ceb..d39ee457 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -36,13 +36,6 @@ TARGET_USE_PAN_DISPLAY := true SF_START_GRAPHICS_ALLOCATOR_SERVICE := true -# enable to use the CPUSETS feature -ENABLE_CPUSETS := true -ENABLE_SCHEDBOOST := true -# We may want to enable this later -# but right now it doesn't build. -#ENABLE_SCHED_BOOST := true - BOARD_SEPOLICY_DIRS += device/linaro/hikey/sepolicy ifeq ($(HOST_OS), linux) |