From d7d2efab84d55a8957b1104ce610a5331e073818 Mon Sep 17 00:00:00 2001
From: Jin Qian <jinqian@google.com>
Date: Wed, 7 Dec 2016 18:11:48 -0800
Subject: [PATCH] ANDROID: build: fix build config kernel_dir

Change-Id: I88b87a9c85990b12dc8174349cfc14eddfb379d2
---
 build.config.goldfish.arm    | 2 +-
 build.config.goldfish.arm64  | 2 +-
 build.config.goldfish.mips   | 2 +-
 build.config.goldfish.mips64 | 2 +-
 build.config.goldfish.x86    | 2 +-
 build.config.goldfish.x86_64 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.config.goldfish.arm b/build.config.goldfish.arm
index bab53668e033..866da9361b71 100644
--- a/build.config.goldfish.arm
+++ b/build.config.goldfish.arm
@@ -3,7 +3,7 @@ BRANCH=android-4.4
 CROSS_COMPILE=arm-linux-androidkernel-
 DEFCONFIG=ranchu_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
 FILES="
 arch/arm/boot/zImage
diff --git a/build.config.goldfish.arm64 b/build.config.goldfish.arm64
index 0b4c40604b76..9c963cf4a3d8 100644
--- a/build.config.goldfish.arm64
+++ b/build.config.goldfish.arm64
@@ -3,7 +3,7 @@ BRANCH=android-4.4
 CROSS_COMPILE=aarch64-linux-android-
 DEFCONFIG=ranchu64_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
 FILES="
 arch/arm64/boot/Image
diff --git a/build.config.goldfish.mips b/build.config.goldfish.mips
index 5dcd8a181ec0..8af53d2c2940 100644
--- a/build.config.goldfish.mips
+++ b/build.config.goldfish.mips
@@ -3,7 +3,7 @@ BRANCH=android-4.4
 CROSS_COMPILE=mips64el-linux-android-
 DEFCONFIG=ranchu_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9/bin
 FILES="
 vmlinux
diff --git a/build.config.goldfish.mips64 b/build.config.goldfish.mips64
index 9c0b6cbfdb9b..2a33d36dc4c8 100644
--- a/build.config.goldfish.mips64
+++ b/build.config.goldfish.mips64
@@ -3,7 +3,7 @@ BRANCH=android-4.4
 CROSS_COMPILE=mips64el-linux-android-
 DEFCONFIG=ranchu64_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9/bin
 FILES="
 vmlinux
diff --git a/build.config.goldfish.x86 b/build.config.goldfish.x86
index 2b8a9b75a14b..f86253f58d4d 100644
--- a/build.config.goldfish.x86
+++ b/build.config.goldfish.x86
@@ -3,7 +3,7 @@ BRANCH=android-4.4
 CROSS_COMPILE=x86_64-linux-android-
 DEFCONFIG=i386_ranchu_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin
 FILES="
 arch/x86/boot/bzImage
diff --git a/build.config.goldfish.x86_64 b/build.config.goldfish.x86_64
index 940caefc800f..e1738861ec5c 100644
--- a/build.config.goldfish.x86_64
+++ b/build.config.goldfish.x86_64
@@ -3,7 +3,7 @@ BRANCH=android-4.4
 CROSS_COMPILE=x86_64-linux-android-
 DEFCONFIG=x86_64_ranchu_defconfig
 EXTRA_CMDS=''
-KERNEL_DIR=goldfish
+KERNEL_DIR=common
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin
 FILES="
 arch/x86/boot/bzImage
-- 
2.11.0