diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-09-23 11:44:29 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2011-09-23 11:44:29 +0200 |
| commit | becc3da91507193ef4270d65e2756bb0a00c15a9 (patch) | |
| tree | 1503f343a249a0704920a459745c66fc4258bb12 /core/tasks | |
| parent | 280cc6655812689a84584b1689555f6d50787a3c (diff) | |
| parent | 2f2882a04e50af2cf8a7b99d3c2a184c131740fa (diff) | |
| download | build-becc3da91507193ef4270d65e2756bb0a00c15a9.zip build-becc3da91507193ef4270d65e2756bb0a00c15a9.tar.gz build-becc3da91507193ef4270d65e2756bb0a00c15a9.tar.bz2 | |
resolved conflicts for merge of 2f2882a0 to master
Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
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..f3aec65 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 \ + $(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 |