Merge change 4496
* changes:
Switch default toolchain to 4.4.0 in master.
diff --git a/core/Makefile b/core/Makefile
index df41628..478f414 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -791,6 +791,8 @@
$(call intermediates-dir-for,EXECUTABLES,updater)/updater
$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)
+$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_API_VERSION := $(RECOVERY_API_VERSION)
+
# Depending on the various images guarantees that the underlying
# directories are up-to-date.
$(BUILT_TARGET_FILES_PACKAGE): \
@@ -860,6 +862,7 @@
$(hide) mkdir -p $(zip_root)/META
$(hide) $(ACP) $(APKCERTS_FILE) $(zip_root)/META/apkcerts.txt
$(hide) echo "$(PRODUCT_OTA_PUBLIC_KEYS)" > $(zip_root)/META/otakeys.txt
+ $(hide) echo "$(PRIVATE_RECOVERY_API_VERSION)" > $(zip_root)/META/recovery-api-version.txt
@# Zip everything up, preserving symlinks
$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index eef473b..46be49f 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -19,6 +19,11 @@
sqlite3 \
LatinIME \
PinyinIME \
+ OpenWnn \
+ libWnnEngDic \
+ libWnnJpnDic \
+ libWnnZHCNDic \
+ libwnndict \
ApiDemos \
SoftKeyboard
diff --git a/tools/droiddoc/templates-pdk/customization.cs b/tools/droiddoc/templates-pdk/customization.cs
index 563af1e..3740469 100644
--- a/tools/droiddoc/templates-pdk/customization.cs
+++ b/tools/droiddoc/templates-pdk/customization.cs
@@ -16,7 +16,7 @@
elif:publish ?> <?cs
elif:about ?> <?cs /if ?>">
<li id="guide-link"><a href="<?cs var:toroot ?>guide/index.html"
- onClick="return loadLast('guide)'"><span>Porting Guide</span></a></li>
+ onClick="return loadLast('guide)'"><span>Dev Guide</span></a></li>
<li id="opensource-link"><a href="http://source.android.com/"
onClick="return loadLast('open')"><span>Open Source</span></a></li>
</ul>
diff --git a/tools/droiddoc/templates-pdk/head_tag.cs b/tools/droiddoc/templates-pdk/head_tag.cs
index 1a7f1a8..47b332a 100644
--- a/tools/droiddoc/templates-pdk/head_tag.cs
+++ b/tools/droiddoc/templates-pdk/head_tag.cs
@@ -7,7 +7,7 @@
if:sdk.version ?> (<?cs
var:sdk.version ?>)<?cs
/if ?> | <?cs
- /if ?>Android Developers</title>
+ /if ?>Android Open Source</title>
<link href="<?cs var:toroot ?>assets/android-developer-docs-devguide.css" rel="stylesheet" type="text/css" />
<link href="<?cs var:toroot ?>assets-pdk/pdk-local.css" rel="stylesheet" type="text/css" />
<script src="<?cs var:toroot ?>assets/search_autocomplete.js" type="text/javascript"></script>