Merge change 27066 into eclair
* changes:
parallellize computation of binary patches
diff --git a/core/build_id.mk b/core/build_id.mk
index 40bb35d..4661aea 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -23,7 +23,7 @@
# (like "TC1-RC5"). It must be a single word, and is
# capitalized by convention.
#
-BUILD_ID := MASTER
+BUILD_ID := ECLAIR
# DISPLAY_BUILD_NUMBER should only be set for development branches,
# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
diff --git a/tools/droiddoc/templates-sdk/header_tabs.cs b/tools/droiddoc/templates-sdk/header_tabs.cs
index ad7f4a4..356916b 100644
--- a/tools/droiddoc/templates-sdk/header_tabs.cs
+++ b/tools/droiddoc/templates-sdk/header_tabs.cs
@@ -6,9 +6,10 @@
elif:community ?>community<?cs
elif:videos ?>videos<?cs /if ?>">
- <?cs if:android.whichdoc == "online" ?>
- <li id="home-link"><a href="<?cs var:toroot ?>index.html">
- <?cs if:!sdk.redirect ?>
+ <li id="home-link"><a href="<?cs var:toroot ?><?cs
+ if:android.whichdoc != "online" ?>offline.html<?cs
+ else ?>index.html<?cs /if ?>">
+ <?cs if:!sdk.redirect ?>
<span class="en">Home</span>
<span style="display:none" class="de">Startseite</span>
<span style="display:none" class="es"></span>
@@ -17,12 +18,11 @@
<span style="display:none" class="ja">ホーム</span>
<span style="display:none" class="zh-CN">主页</span>
<span style="display:none" class="zh-TW">首頁</span>
- <?cs /if ?>
+ <?cs /if ?>
</a></li>
- <?cs /if ?> <?cs # end of "if online" ?>
- <li id="sdk-link"><a href="<?cs var:toroot ?>sdk/<?cs
- if:android.whichdoc != "online" ?>offline-welcome.html<?cs
- else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>">
+ <li id="sdk-link"><a href="<?cs var:toroot ?><?cs
+ if:android.whichdoc != "online" ?>sdk/RELEASENOTES.html<?cs
+ else ?>sdk/<?cs var:sdk.current ?>/index.html<?cs /if ?>">
<span class="en">SDK</span>
</a></li>
<li id="guide-link"><a href="<?cs var:toroot ?>guide/index.html" onClick="return loadLast('guide')">
diff --git a/tools/droiddoc/templates/assets/search_autocomplete.js b/tools/droiddoc/templates/assets/search_autocomplete.js
index 929751f..f2e6f5c 100644
--- a/tools/droiddoc/templates/assets/search_autocomplete.js
+++ b/tools/droiddoc/templates/assets/search_autocomplete.js
@@ -168,6 +168,6 @@
function submit_search() {
var query = document.getElementById('search_autocomplete').value;
- document.location = toRoot + 'search.html#q=' + query; // toRoot is initialized in android-developer-docs.js
+ document.location = '/search.html#q=' + query + '&t=0';
return false;
}