diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-06-23 12:18:49 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-06-23 12:18:49 -0700 |
| commit | cac8e55714424d385da5b40e5952dc539e510454 (patch) | |
| tree | 691ed4be4518b413be4a31d1fe101edce8a0a0c4 /core | |
| parent | f9f83ed19e83313ffaf542b148886bcb860ca12e (diff) | |
| parent | 77ec16ae9e00a929b1925aeca9635dee5dbff0a0 (diff) | |
| download | build-cac8e55714424d385da5b40e5952dc539e510454.zip build-cac8e55714424d385da5b40e5952dc539e510454.tar.gz build-cac8e55714424d385da5b40e5952dc539e510454.tar.bz2 | |
Merge "sdk: provide ABI-dependent atree files"
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 9766336..08ca785 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) \ |