merge intel x86 patches into gingerbread branch

4 files changed, 58 insertions, 4 deletions

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 161136eda..c2664cd1a 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -66,10 +66,12 @@ out/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/
 obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl
 
 # System images + Kernel
-system.img                              platforms/${PLATFORM_NAME}/images/system.img
-ramdisk.img                             platforms/${PLATFORM_NAME}/images/ramdisk.img
-userdata.img                            platforms/${PLATFORM_NAME}/images/userdata.img
-prebuilt/android-arm/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/kernel-qemu
+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
+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