diff options
| author | Elliott Hughes <enh@google.com> | 2017-06-29 03:18:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-29 03:18:51 +0000 |
| commit | ff532e0896da3a4c5dc3d4c60b86a3beb2361ecb (patch) | |
| tree | 0bdc50203d9c0e856c77d3171bfe0bcb5a341782 | |
| parent | fb6b8855a636a80bf039dc20814255a36a053fbe (diff) | |
| parent | dd515b1dda9eb10eb60003419534c8ea0567bc6d (diff) | |
| download | hikey-ff532e0896da3a4c5dc3d4c60b86a3beb2361ecb.tar.gz | |
resolve merge conflicts of 99d2e72 to stage-aosp-master am: 761c9b2cc4
am: dd515b1dda
Change-Id: I1eccfc5454feaaddb66eaf6d3579f2d6fd9373ce
| -rw-r--r-- | BoardConfigCommon.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index c7eb435c..63062c11 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 DEVICE_MANIFEST_FILE := device/linaro/hikey/manifest.xml |