diff options
| author | David Turner <digit@android.com> | 2011-03-22 06:03:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 06:03:40 -0700 |
| commit | db0d59d1b4a02816832d330c0bfa86ee67f2776e (patch) | |
| tree | 245daa6e9375758215273cd43f493b774ab6ef95 /core/Makefile | |
| parent | 86ed1dbaa74e1c5b21f98dbb74f2b600a9025470 (diff) | |
| parent | b1047a99ce8b8d62ef911c5dfba7183c32e80a70 (diff) | |
| download | build-db0d59d1b4a02816832d330c0bfa86ee67f2776e.zip build-db0d59d1b4a02816832d330c0bfa86ee67f2776e.tar.gz build-db0d59d1b4a02816832d330c0bfa86ee67f2776e.tar.bz2 | |
am b1047a99: Merge changes I00c75f37,I1fc3cb49
* commit 'b1047a99ce8b8d62ef911c5dfba7183c32e80a70':
x86: the -mbionic flag is needed for IA builds.
x86: qemu emulator is the default build target
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 4edfcd1..3535ef7 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1260,7 +1260,7 @@ ifneq ($(TARGET_SIMULATOR),true) INTERNAL_EMULATOR_PACKAGE_FILES += \ $(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \ - prebuilt/android-arm/kernel/kernel-qemu \ + prebuilt/android-$(TARGET_ARCH)/kernel/kernel-qemu \ $(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_SYSTEMIMAGE) \ $(INSTALLED_USERDATAIMAGE_TARGET) @@ -1385,9 +1385,11 @@ $(INTERNAL_SDK_TARGET): $(deps) -I $(TARGET_COMMON_OUT_ROOT) \ -v "PLATFORM_NAME=android-$(PLATFORM_VERSION)" \ -v "OUT_DIR=$(OUT_DIR)" \ + -v "TARGET_ARCH=$(TARGET_ARCH)" \ + -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \ -o $(PRIVATE_DIR) && \ cp -f $(target_notice_file_txt) \ - $(PRIVATE_DIR)/platforms/android-$(PLATFORM_VERSION)/images/NOTICE.txt && \ + $(PRIVATE_DIR)/platforms/android-$(PLATFORM_VERSION)/images/$(TARGET_CPU_ABI)/NOTICE.txt && \ cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/tools/NOTICE.txt && \ if [ -f $(PRIVATE_DIR)/platform-tools/llvm-rs-cc ]; then \ $(HOST_STRIP_SDK_LLVM) $(PRIVATE_DIR)/platform-tools/llvm-rs-cc; \ |