summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2011-09-22 22:58:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-22 22:58:04 -0700
commit0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2 (patch)
treea42c1d1af1faeafc5f2ed72e697fc3bb4c10bb7d /core
parent1615c2fcb60c7164cd8629e8c78cef551ebd329a (diff)
parent041fb639bfb979f4ab18d6dcaf63656639b2eec5 (diff)
downloadbuild-0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2.zip
build-0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2.tar.gz
build-0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2.tar.bz2
Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
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 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