commit 147418e139bdc228a0101eeba02754114c1c2888
author Kees Cook <keescook@google.com> Wed Dec 09 16:41:23 2015 -0800
committer Kees Cook <keescook@google.com> Wed Dec 09 16:41:23 2015 -0800
tree 74d10131458d8e39b015465e19b1b7da91fa287f
parent e472d731dc679ee74b247f68636f55086dc312ea

Move x86 emulators to v4.1 kernel

With goldfish support backported into the v4.1 tree, we can move the
x86 emulators forward.

Change-Id: Ifb851a6f15e2aa79bcb9817bcea949244c207bf3
Signed-off-by: Kees Cook <keescook@google.com>

brilloemulator_x86/bsp/qemu_x86.mk

diff --git a/brilloemulator_x86/bsp/qemu_x86.mk b/brilloemulator_x86/bsp/qemu_x86.mk
index def4c01..67ad86e 100644
--- a/brilloemulator_x86/bsp/qemu_x86.mk
+++ b/brilloemulator_x86/bsp/qemu_x86.mk
@@ -35,7 +35,7 @@
   system/core/rootdir/ueventd.rc:root/ueventd.rc \
 
 # Set up the local kernel.
-TARGET_KERNEL_SRC := hardware/bsp/kernel/common/android-3.18
+TARGET_KERNEL_SRC := hardware/bsp/kernel/common/v4.1
 TARGET_KERNEL_DEFCONFIG := i386_defconfig
 TARGET_KERNEL_CONFIGS := $(realpath $(LOCAL_PATH)/brillo.kconf)
 

brilloemulator_x86_64/bsp/qemu_x86_64.mk

diff --git a/brilloemulator_x86_64/bsp/qemu_x86_64.mk b/brilloemulator_x86_64/bsp/qemu_x86_64.mk
index b3bfd9c..bc0d25b 100644
--- a/brilloemulator_x86_64/bsp/qemu_x86_64.mk
+++ b/brilloemulator_x86_64/bsp/qemu_x86_64.mk
@@ -44,7 +44,7 @@
   system/core/rootdir/ueventd.rc:root/ueventd.rc \
 
 # Set up the local kernel.
-TARGET_KERNEL_SRC := hardware/bsp/kernel/common/android-3.18
+TARGET_KERNEL_SRC := hardware/bsp/kernel/common/v4.1
 TARGET_KERNEL_DEFCONFIG := x86_64_defconfig
 TARGET_KERNEL_CONFIGS := $(realpath $(LOCAL_PATH)/brillo.kconf)