From f7f6842b3235d3537ba2dbd5e13193f428557366 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@android.com>
Date: Thu, 23 Jun 2011 12:53:56 +0200
Subject: [PATCH] sdk: Copy ABI-specific kernel image to platform image
 directory.

This patch depends on https://review.source.android.com/24052

It is used to ensure that the proper kernel image is copied to the
platform image's kernel-qemu.

This is needed because for ARMv7 platform builds, the image is
in prebuilt/android-arm/kernel/kernel-qemu-armv7, instead of
   prebuilt/android-arm/kernel/kernel-qemu

Change-Id: I0f175a1ba3d97f5c7420597bdeebc7a353551194
---
 build/sdk-android-armeabi-v7a.atree | 18 ++++++++++++++++++
 build/sdk-android-armeabi.atree     | 17 +++++++++++++++++
 build/sdk-android-x86.atree         | 17 +++++++++++++++++
 build/sdk.atree                     |  3 ++-
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 build/sdk-android-armeabi-v7a.atree
 create mode 100644 build/sdk-android-armeabi.atree
 create mode 100644 build/sdk-android-x86.atree

diff --git a/build/sdk-android-armeabi-v7a.atree b/build/sdk-android-armeabi-v7a.atree
new file mode 100644
index 000000000..8a7999481
--- /dev/null
+++ b/build/sdk-android-armeabi-v7a.atree
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2011 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.
+#
+
+# Copy the ARMv7 specific kernel image to .../kernel-qemu
+prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu-armv7 platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
diff --git a/build/sdk-android-armeabi.atree b/build/sdk-android-armeabi.atree
new file mode 100644
index 000000000..d90b069fa
--- /dev/null
+++ b/build/sdk-android-armeabi.atree
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2011 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.
+#
+
+prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
diff --git a/build/sdk-android-x86.atree b/build/sdk-android-x86.atree
new file mode 100644
index 000000000..d90b069fa
--- /dev/null
+++ b/build/sdk-android-x86.atree
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2011 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.
+#
+
+prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
diff --git a/build/sdk.atree b/build/sdk.atree
index 41a94f4e2..a8aa0c520 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -69,9 +69,10 @@ obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl
 system.img                              platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/system.img
 ramdisk.img                             platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/ramdisk.img
 userdata.img                            platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/userdata.img
-prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
 system/build.prop platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/build.prop
 
+# Note: the kernel image is handled by sdk-android-<abi>.atree now.
+
 # emulator skins from sdk.git
 development/tools/emulator/skins/QVGA      platforms/${PLATFORM_NAME}/skins/QVGA
 development/tools/emulator/skins/WQVGA432  platforms/${PLATFORM_NAME}/skins/WQVGA432