From: David 'Digit' Turner <digit@android.com>
Date: Thu, 23 Jun 2011 10:49:02 +0000 (+0200)
Subject: sdk: provide ABI-dependent atree files
X-Git-Tag: android-x86-4.4-r1~1120^2~145^2~22^2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=77ec16ae9e00a929b1925aeca9635dee5dbff0a0;p=android-x86%2Fbuild.git

sdk: provide ABI-dependent atree files

This patch allows development/sdk/ to provide ABI-specific .atree
files. This is useful to copy prebuilt CPU model-specific files
to the SDK platform image directory.

This is needed to deal with the fact that for ARMv7 platform builds,
the kernel image to use is prebuilt/android-arm/kernel-qemu-armv7 instead
of prebuilt/android-arm/kernel/qemu

Change-Id: Icdca751852c01421fccf196436a9bc1114ea90f7
---

diff --git a/core/Makefile b/core/Makefile
index 97663362e..08ca78536 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1346,6 +1346,14 @@ sdk_atree_files := \
 	$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \
 	$(sdk_tools_atree_files)
 
+# development/build/sdk-android-<abi>.atree is used to differentiate
+# between architecture models (e.g. ARMv5TE versus ARMv7) when copying
+# files like the kernel image. We use TARGET_CPU_ABI because we don't
+# have a better way to distinguish between CPU models.
+ifneq (,$(strip $(wildcard $(atree_dir)/sdk-android-$(TARGET_CPU_ABI).atree)))
+  sdk_atree_files += $(atree_dir)/sdk-android-$(TARGET_CPU_ABI).atree
+endif
+
 deps := \
 	$(target_notice_file_txt) \
 	$(tools_notice_file_txt) \