diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-07-11 11:55:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-11 11:55:35 -0700 |
| commit | d19750e87f454507a9cee01989416ffbd14ea3f5 (patch) | |
| tree | 080cb445d9b9330e0a1e963696d8d7c91aea882a /core/tasks | |
| parent | 7c32eebac5bc5811f95bf2209ad80fcc6ebb550a (diff) | |
| parent | 36331f8455822539fe4fbb0a25fbc377bbc80a89 (diff) | |
| download | build-d19750e87f454507a9cee01989416ffbd14ea3f5.zip build-d19750e87f454507a9cee01989416ffbd14ea3f5.tar.gz build-d19750e87f454507a9cee01989416ffbd14ea3f5.tar.bz2 | |
am 36331f84: resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp
* commit '36331f8455822539fe4fbb0a25fbc377bbc80a89': (23 commits)
sdk-addon.mk: Copy image files to ABI-specific dir
emulator: Enable dex-preoptimization
sdk: provide ABI-dependent atree files
emulator: Build emulator platform images as ARMv7-A
x86: Add proper gcc-4.4.3 x86 toolchain support.
sdk: Add pc-bios files for IA qemu emulator
x86: qemu emulator is the default build target
Add full_x86 product.
x86: sdk_x86 build target
Minor cleanup - DO NOT MERGE
Clean up full config - DO NOT MERGE
Make a full list of locales available
Truly default to the full config.
generic_x86 builds don't need/use the sparse ext4 format.
Use ext4 file system for generic_x86 userdata partition
GB Updates for init.rc and boot command line
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
Display the TARGET_ARCH_VARIANT
Add generic_x86-eng to the lunch menu
Move buildspec vars to BoardConfig.mk
...
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/sdk-addon.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index 797314a..abbf999 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -58,6 +58,7 @@ files_to_copy += \ $(BUILT_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \ $(BUILT_USERDATAIMAGE_TARGET):images/$(TARGET_CPU_ABI)/userdata.img \ $(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \ + $(ANDROID_PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \ $(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt # Generate rules to copy the requested files |