Merge "Changing the default launcher and recents implementation for aosp build" into pi-dev
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
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 @@
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
