Merge change 3459 into donut
* changes:
make signapk strip other signatures
diff --git a/cleanspec.mk b/cleanspec.mk
index cba6cfa..4cf3f59 100644
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -82,6 +82,7 @@
$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/SHARED_LIBRARIES/lib?camera_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/STATIC_LIBRARIES/lib?camera_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libwebcore_intermediates)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/core/definitions.mk b/core/definitions.mk
index f3382c3..eccdfc9 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1224,7 +1224,7 @@
echo Missing file $$f; \
exit 1; \
fi; \
- unzip -q $$f -d $(2); \
+ unzip -qo $$f -d $(2); \
(cd $(2) && rm -rf META-INF); \
done
endef
diff --git a/core/pathmap.mk b/core/pathmap.mk
index de7c1bb..e281b9d 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -82,8 +82,9 @@
opengl \
sax \
telephony \
- tts \
wifi \
+ vpn \
+ keystore \
)
#
diff --git a/target/product/core.mk b/target/product/core.mk
index 7c1ca00..d9bf34d 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -17,9 +17,12 @@
DownloadProvider \
GoogleSearch \
MediaProvider \
+ PicoTts \
SettingsProvider \
TelephonyProvider \
+ TtsService \
UserDictionaryProvider \
PackageInstaller \
+ WebSearchProvider \
Bugreport
diff --git a/target/product/min_dev.mk b/target/product/min_dev.mk
index 7d0fbe6..005af70 100644
--- a/target/product/min_dev.mk
+++ b/target/product/min_dev.mk
@@ -12,6 +12,7 @@
MediaProvider \
SettingsProvider \
PackageInstaller \
+ WebSearchProvider \
Bugreport \
Launcher \
Settings \
diff --git a/tools/droiddoc/templates/assets/search_autocomplete.js b/tools/droiddoc/templates/assets/search_autocomplete.js
index 2e12e0f..929751f 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 = '/search.html#q=' + query;
+ document.location = toRoot + 'search.html#q=' + query; // toRoot is initialized in android-developer-docs.js
return false;
}