diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-09-22 22:59:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-22 22:59:07 -0700 |
| commit | fdb13fccfecdf526549ad453a20e8136253edb51 (patch) | |
| tree | 53e1af266df838630b03aad5b698c02a34b4d114 /core | |
| parent | 89ba0f7e62e94fbe010bcf9aab3e1be035ffb44a (diff) | |
| parent | 0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2 (diff) | |
| download | build-fdb13fccfecdf526549ad453a20e8136253edb51.zip build-fdb13fccfecdf526549ad453a20e8136253edb51.tar.gz build-fdb13fccfecdf526549ad453a20e8136253edb51.tar.bz2 | |
am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit '0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2':
sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
Diffstat (limited to 'core')
| -rw-r--r-- | core/tasks/sdk-addon.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index 2641a31..a617e43 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -58,7 +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 \ + $(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 |