summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2011-01-05 15:50:22 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-05 15:50:22 -0800
commitce7b1d5827df6316c433f851b95a77795e5e048c (patch)
treeb1c60c1d425939f8163fa9490c9e229e090fe7f7
parent6d504c6bc5a724466da17fb203a4ea98b199bcdc (diff)
parente503fcd52ec8bbcc9fd4ea4b242f73c6c2cae3d3 (diff)
downloadbuild-ce7b1d5827df6316c433f851b95a77795e5e048c.zip
build-ce7b1d5827df6316c433f851b95a77795e5e048c.tar.gz
build-ce7b1d5827df6316c433f851b95a77795e5e048c.tar.bz2
am e503fcd5: am 7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit 'e503fcd52ec8bbcc9fd4ea4b242f73c6c2cae3d3': Pass OUT_DIR variable to atree.
-rw-r--r--core/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile
index edde15f..be15de9 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1390,6 +1390,7 @@ $(INTERNAL_SDK_TARGET): $(deps)
-I $(HOST_OUT) \
-I $(TARGET_COMMON_OUT_ROOT) \
-v "PLATFORM_NAME=android-$(PLATFORM_VERSION)" \
+ -v "OUT_DIR=$(OUT_DIR)" \
-o $(PRIVATE_DIR) && \
cp -f $(target_notice_file_txt) \
$(PRIVATE_DIR)/platforms/android-$(PLATFORM_VERSION)/images/NOTICE.txt && \