commit 1c0b37567bb7cdf509adae3e8c2452d61eaf0383
author Raphael Moll <ralf@android.com> Wed Jan 05 15:50:28 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 05 15:50:28 2011 -0800
tree 7122c567770ecf3e6d9985ece423fd3fa54e59c4
parent e55d8df166b05e757f2643ac3b0d33ddf87776d4
parent 40812f1c4b312d8276eb2839c06d2d76dd4f97e1

am 40812f1c: am 1bf9f693: Merge "Use OUT_DIR in atree to find android.jar"

* commit '40812f1c4b312d8276eb2839c06d2d76dd4f97e1':
  Use OUT_DIR in atree to find android.jar

build/sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index 1391476..cceec19 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -60,7 +60,7 @@
 sdk/sdk-build.prop platforms/${PLATFORM_NAME}/build.prop
 
 # the uper-jar file that apps link against. This is the public API
-out/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar
+${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar
 
 # the aidl precompiled include
 obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl