summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2011-09-22 23:01:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-22 23:01:17 -0700
commit2f2882a04e50af2cf8a7b99d3c2a184c131740fa (patch)
tree285ba6c6f11cfc0d1bf7781b7a0291a067a205ef /core
parent7094bf3a5e9d1983d6877f580506d93fd736c437 (diff)
parentfdb13fccfecdf526549ad453a20e8136253edb51 (diff)
downloadbuild-2f2882a04e50af2cf8a7b99d3c2a184c131740fa.zip
build-2f2882a04e50af2cf8a7b99d3c2a184c131740fa.tar.gz
build-2f2882a04e50af2cf8a7b99d3c2a184c131740fa.tar.bz2
am fdb13fcc: am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit 'fdb13fccfecdf526549ad453a20e8136253edb51': sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
Diffstat (limited to 'core')
-rw-r--r--core/tasks/sdk-addon.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk
index abbf999..f3aec65 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