diff options
| author | Elliott Hughes <enh@google.com> | 2017-06-28 13:56:47 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2017-06-28 13:56:47 -0700 |
| commit | 761c9b2cc4d03deefe5625c4210f60f9916268ae (patch) | |
| tree | 79e40b5e5b4d0f008418f673d0fb9cf736544121 | |
| parent | 760a86d6b28aad3727badb83832fd96404c34bed (diff) | |
| parent | 99d2e724b33ce8a430022d574663daf170b73ef8 (diff) | |
| download | hikey-761c9b2cc4d03deefe5625c4210f60f9916268ae.tar.gz | |
resolve merge conflicts of 99d2e72 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I08501e89613ea11d25d7de06ff47a7b545228b6c
| -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) |