Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
diff --git a/core/base_rules.mk b/core/base_rules.mk
index 3f343e2..0d17c83 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -491,6 +491,8 @@
# Don't use += on subvars, or else they'll end up being
# recursively expanded.
+ALL_MODULES.$(LOCAL_MODULE).CLASS := \
+ $(ALL_MODULES.$(LOCAL_MODULE).CLASS) $(LOCAL_MODULE_CLASS)
ALL_MODULES.$(LOCAL_MODULE).PATH := \
$(ALL_MODULES.$(LOCAL_MODULE).PATH) $(LOCAL_PATH)
ALL_MODULES.$(LOCAL_MODULE).TAGS := \
diff --git a/core/main.mk b/core/main.mk
index ddd05bb..ae7abb6 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -692,8 +692,8 @@
unbundled_build_modules :=
ifneq ($(filter all,$(TARGET_BUILD_APPS)),)
- # If they used the magic goal "all" then build everything
- unbundled_build_modules := $(sort $(call get-tagged-modules,$(ALL_MODULE_TAGS)))
+ # If they used the magic goal "all" then build all apps in the source tree.
+ unbundled_build_modules := $(foreach m,$(sort $(ALL_MODULES)),$(if $(filter APPS,$(ALL_MODULES.$(m).CLASS)),$(m)))
else
unbundled_build_modules := $(TARGET_BUILD_APPS)
endif
@@ -786,4 +786,3 @@
.PHONY: showcommands
showcommands:
@echo >/dev/null
-
diff --git a/envsetup.sh b/envsetup.sh
index f4dfc55..21a66c1 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -546,6 +546,9 @@
if [ -z "$variant" ]; then
variant=eng
fi
+ if [ -z "$apps" ]; then
+ apps=all
+ fi
export TARGET_PRODUCT=generic
export TARGET_BUILD_VARIANT=$variant
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index 0823db4..a062af3 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -151,6 +151,7 @@
</a>
</div>
?>
+
<p>Welcome Developers! If you are new to the Android SDK, please read the <a
href="#quickstart">Quick Start</a>, below, for an overview of how to install and
set up the SDK. </p>
@@ -169,7 +170,8 @@
<tr>
<td>Windows</td>
<td>
- <a href="<?cs var:toroot ?>sdk/download.html?v=<?cs var:sdk.win_download ?>"><?cs var:sdk.win_download ?></a>
+ <a onclick="onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.win_download
+?>"><?cs var:sdk.win_download ?></a>
</td>
<td><?cs var:sdk.win_bytes ?> bytes</td>
<td><?cs var:sdk.win_checksum ?></td>
@@ -177,7 +179,8 @@
<tr class="alt-color">
<td>Mac OS X (intel)</td>
<td>
- <a href="<?cs var:toroot ?>sdk/download.html?v=<?cs var:sdk.mac_download ?>"><?cs var:sdk.mac_download ?></a>
+ <a onclick="onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.mac_download
+?>"><?cs var:sdk.mac_download ?></a>
</td>
<td><?cs var:sdk.mac_bytes ?> bytes</td>
<td><?cs var:sdk.mac_checksum ?></td>
@@ -185,7 +188,8 @@
<tr>
<td>Linux (i386)</td>
<td>
- <a href="<?cs var:toroot ?>sdk/download.html?v=<?cs var:sdk.linux_download ?>"><?cs var:sdk.linux_download ?></a>
+ <a onclick="onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.linux_download
+?>"><?cs var:sdk.linux_download ?></a>
</td>
<td><?cs var:sdk.linux_bytes ?> bytes</td>
<td><?cs var:sdk.linux_checksum ?></td>
@@ -202,6 +206,19 @@
<?cs /if ?>
</table>
+
+<div id="next-steps" style="display:none">
+ <p><b>Your download of <em><span id="filename"></span></em> has begun!</b></p>
+</div>
+
+<script type="text/javascript">
+function onDownload(link) {
+ $(link).parent().parent().children().css('background', '#fff');
+ $("#filename").text($(link).html());
+ $("#next-steps").show();
+}
+</script>
+
<?cs /if ?>
<?cs /if ?>
<?cs /if ?>
diff --git a/tools/droiddoc/templates/assets/android-developer-docs.css b/tools/droiddoc/templates/assets/android-developer-docs.css
index a3bab76..da39a4a 100644
--- a/tools/droiddoc/templates/assets/android-developer-docs.css
+++ b/tools/droiddoc/templates/assets/android-developer-docs.css
@@ -813,8 +813,8 @@
div.figure {
float:right;
clear:right;
- margin:1em 0 0 3em;
- padding:0;
+ margin:1em 0 0 0;
+ padding:0 0 0 3em;
background-color:#fff;
/* width must be defined w/ an inline style matching the image width */
}