From e1b77e9c264806c2d6200e28b289522f52d433a0 Mon Sep 17 00:00:00 2001 From: Shawn Yang Date: Thu, 31 May 2018 17:59:43 -0700 Subject: [PATCH 1/2] Update board-info.txt generation method Bug: 80490116 Update makefile to remove direct shell call to generate the board-info.txt file. Test: Manually verify the build passed and board-info.txt generated contains correct info Change-Id: Iae10d6d301f9f22668c8cef57ee0f286225c8046 --- AndroidBoard.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 AndroidBoard.mk diff --git a/AndroidBoard.mk b/AndroidBoard.mk new file mode 100644 index 0000000..006fe5c --- /dev/null +++ b/AndroidBoard.mk @@ -0,0 +1,17 @@ +# +# Copyright 2018 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +-include vendor/google_devices/taimen/proprietary/AndroidBoardVendor.mk From af1cb8d0a2ece5acded6f5ccf51a79af3577ad42 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Tue, 5 Jun 2018 15:23:29 -0700 Subject: [PATCH 2/2] Revert "Switch to deadline IO scheduler post boot." This reverts commit 5e3069df106f86d819e479c4ecff61e0b31f6440. Test: boots bug: 63630139 Change-Id: I39b0c46ac881e06c4ec276db1cb4c4d8cea53821 --- init-taimen.rc | 2 -- 1 file changed, 2 deletions(-) diff --git a/init-taimen.rc b/init-taimen.rc index 3fd4914..14c5fc0 100644 --- a/init-taimen.rc +++ b/init-taimen.rc @@ -23,8 +23,6 @@ on property:sys.boot_completed=1 write /sys/block/sde/queue/iostats 1 write /sys/block/dm-0/queue/read_ahead_kb 512 write /sys/block/dm-1/queue/read_ahead_kb 512 - write /sys/block/sda/queue/scheduler deadline - write /sys/block/sde/queue/scheduler deadline on boot # Allow ftm4 autotune from adb shell