Merge change 21127
* changes:
Remove 'ctor-dtor-privacy' warning, as it's not very usefull.
diff --git a/core/definitions.mk b/core/definitions.mk
index 0230b9d..2ad2b04 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1470,6 +1470,12 @@
$(hide) cp -fp $< $@
endef
+# The same as copy-file-to-target, but use the zipalign tool to do so.
+define copy-file-to-target-with-zipalign
+@mkdir -p $(dir $@)
+$(hide) $(ZIPALIGN) -f 4 $< $@
+endef
+
# The same as copy-file-to-target, but strip out "# comment"-style
# comments (for config files and such).
define copy-file-to-target-strip-comments
@@ -1497,6 +1503,12 @@
$(copy-file-to-target)
endef
+# Copy a prebuilt file to a target location, using zipalign on it.
+define transform-prebuilt-to-target-with-zipalign
+@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt APK: $(PRIVATE_MODULE) ($@)"
+$(copy-file-to-target-with-zipalign)
+endef
+
# Copy a prebuilt file to a target location, stripping "# comment" comments.
define transform-prebuilt-to-target-strip-comments
@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt: $(PRIVATE_MODULE) ($@)"
diff --git a/core/main.mk b/core/main.mk
index 64c6976..8783461 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -349,6 +349,7 @@
subdirs := \
prebuilt \
build/libs/host \
+ build/tools/zipalign \
dalvik/dexdump \
dalvik/libdex \
dalvik/tools/dmtracedump \
@@ -376,7 +377,6 @@
$(warning sdk-only: javac available.)
subdirs += \
build/tools/signapk \
- build/tools/zipalign \
dalvik/dx \
dalvik/libcore \
development/apps \
diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index 6df276c..34d2453 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -26,6 +26,11 @@
prebuilt_module_is_a_library :=
endif
+# Ensure that prebuilt .apks have been aligned.
+ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),)
+$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ZIPALIGN)
+ $(transform-prebuilt-to-target-with-zipalign)
+else
ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES)
$(transform-prebuilt-to-target-strip-comments)
@@ -33,6 +38,8 @@
$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ACP)
$(transform-prebuilt-to-target)
endif
+endif
+
ifneq ($(prebuilt_module_is_a_library),)
ifneq ($(LOCAL_IS_HOST_MODULE),)
$(transform-host-ranlib-copy-hack)
diff --git a/tools/droiddoc/templates-pdk/customization.cs b/tools/droiddoc/templates-pdk/customization.cs
index 315b81b..dfebb12 100644
--- a/tools/droiddoc/templates-pdk/customization.cs
+++ b/tools/droiddoc/templates-pdk/customization.cs
@@ -1,24 +1,27 @@
<?cs # This file defines custom definitions for the masthead (logo, searchbox, tabs, etc) and
-left nav (toc) that gets placed on all pages. ?>
+left nav (toc) that gets placed on all pages, for the open source site?>
<?cs
def:custom_masthead() ?>
<div id="header">
<div id="headerLeft">
- <a href="<?cs var:toroot ?>guide/index.html" tabindex="-1"><img
+ <a href="http://source.android.com" tabindex="-1"><img
src="<?cs var:toroot ?>assets/images/open_source.png" alt="Open Source Project: Platform Development Kit" /></a>
<ul class="<?cs
- if:reference ?> <?cs
- elif:guide ?> <?cs
- elif:sdk ?> <?cs
- elif:home ?> <?cs
- elif:community ?> <?cs
- elif:publish ?> <?cs
- elif:about ?> <?cs /if ?>">
- <!--<li id="guide-link"><a href="<?cs var:toroot ?>guide/index.html"
- 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>-->
+ if:releases ?> releases<?cs
+ elif:guide ?> guide<?cs
+ elif:licenses ?>licenses <?cs
+ elif:home ?>home <?cs
+ elif:community ?>community <?cs /if ?>">
+ <li id="home-link"><a href="<?cs var:toroot ?>index.html"><span>Home</span></a></li>
+ <li id="guide-link"><a href="<?cs var:toroot ?>guide/index.html"
+ onClick="return loadLast('guide)'"><span>Guide</span></a></li>
+ <li id="releases-ink"><a href="<?cs var:toroot ?>releases/index.html"
+ onClick="return loadLast('releases)'"><span>Releases</span></a></li>
+ <li id="licenses-link"><a href="<?cs var:toroot ?>licenses/index.html"
+ onClick="return loadLast('licenses)'"><span>Licenses</span></a></li>
+ <li id="community-link"><a href="<?cs var:toroot ?>community/index.html"
+ onClick="return loadLast('community)'"><span>Community</span></a></li>
</ul>
</div>
<div id="headerRight">
@@ -49,9 +52,45 @@
</script>
<?cs /def ?>
+<?cs
+def:licenses_nav() ?>
+ <div class="g-section g-tpl-240" id="body-content">
+ <div class="g-unit g-first side-nav-resizable" id="side-nav">
+ <div id="devdoc-nav"><?cs
+ include:"../../../../development/pdk/docs/licenses/licenses_toc.cs" ?>
+ </div>
+ </div> <!-- end side-nav -->
+ <script>
+ addLoadEvent(function() {
+ scrollIntoView("devdoc-nav");
+ });
+ </script>
+<?cs /def ?>
+
+<?cs
+def:releases_nav() ?>
+ <div class="g-section g-tpl-240" id="body-content">
+ <div class="g-unit g-first side-nav-resizable" id="side-nav">
+ <div id="devdoc-nav"><?cs
+ include:"../../../../development/pdk/docs/releases/releases_toc.cs" ?>
+ </div>
+ </div> <!-- end side-nav -->
+ <script>
+ addLoadEvent(function() {
+ scrollIntoView("devdoc-nav");
+ });
+ </script>
+<?cs /def ?>
+
<?cs
-def:custom_left_nav() ?><?cs
- call:guide_nav() ?><?cs
+def:custom_left_nav() ?><?cs
+ if:doc.type == "guide" ?><?cs
+ call:guide_nav() ?><?cs
+ elif:doc.type == "licenses" ?><?cs
+ call:licenses_nav() ?><?cs
+ elif:doc.type == "releases" ?><?cs
+ call:releases_nav() ?><?cs
+ /if ?><?cs
/def ?>
<?cs # appears at the bottom of every page ?><?cs