commit 0e4c0267fb3276cd41c520216dce9b6bded5d46f
author The Android Open Source Project <initial-contribution@android.com> Tue Jul 13 15:24:07 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Jul 13 15:24:07 2010 -0700
tree 12ff94f44352c731e14e20b7848c02800545a8cd
parent b66a5c0574e14b838d9dc2497540ffc6cb73dc4f
parent 36b332beca58f4bc350d820fe0a3a7bb13899028

merge from open-source froyo

Change-Id: I2759c464efef13754154310d10816a5781243311

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index ae7abb6..32d67e9 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -282,6 +282,7 @@
   ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dexopt-flags=m=y
 endif
 
+ifeq (,$(TARGET_BUILD_APPS))
 # Install an apns-conf.xml file if one's not already being installed.
 ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES)))
   PRODUCT_COPY_FILES += \
@@ -302,6 +303,7 @@
     endif
   endif
 endif
+endif # !TARGET_BUILD_APPS
 
 ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android
 

tools/droiddoc/templates-sdk/sdkpage.cs

diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index a062af3..0205408 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -24,10 +24,10 @@
   <div id="jd-content">
     <p>Redirecting to 
     <a href="<?cs var:toroot ?>sdk/<?cs 
-      if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs 
-      else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>">sdk/<?cs 
-      if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs 
-      else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>
+      if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs
+      else ?>index.html<?cs /if ?>"><?cs
+      if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs
+      else ?>Download the SDK<?cs /if ?>
     </a> ...</p>
 <?cs else ?>
 <div class="g-unit" id="doc-content" >