Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev
* changes:
Build: Only preopt boot images in eng builds
Revert "Don't preopt on eng builds."
diff --git a/core/Makefile b/core/Makefile
index f23f023..a0d11df 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -995,6 +995,12 @@
endef
ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
+ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER))
+$(INSTALLED_BOOTIMAGE_TARGET) : $(BOOT_SIGNER)
+endif
+ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))
+$(INSTALLED_BOOTIMAGE_TARGET) : $(VBOOT_SIGNER)
+endif
$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
$(INSTALLED_RAMDISK_TARGET) \
$(INTERNAL_RECOVERYIMAGE_FILES) \
diff --git a/tools/droiddoc/templates-sdk-refonly/assets/css/default.css b/tools/droiddoc/templates-sdk-refonly/assets/css/default.css
index 7989183..106ab2f 100644
--- a/tools/droiddoc/templates-sdk-refonly/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk-refonly/assets/css/default.css
@@ -2628,6 +2628,20 @@
margin-bottom:0;
}
+.summary-table {
+ background-color:#e1e4e6;
+ padding:1em;
+ margin-bottom:1.5em;
+}
+.summary-table p {
+ font-size:.98em;
+}
+
+.summary-table h5 {
+ line-height:1em;
+ font-size:.98em;
+}
+
body.about blockquote {
display:block;
float:right;
@@ -8501,12 +8515,12 @@
$spritesheet: width height image $spritesheet-sprites;
*/
.dac-sprite, #tb li:before, #qv li:before {
- background-image: url(/assets/images/sprite.png);
+ background-image: url(../../assets/images/sprite.png);
display: inline-block;
vertical-align: middle; }
@media screen and (min-device-pixel-ratio: 1.5) {
.dac-sprite, #tb li:before, #qv li:before {
- background-image: url(/assets/images/sprite-2x.png);
+ background-image: url(../../assets/images/sprite-2x.png);
background-size: 50% 50%; } }
.dac-sprite.dac-auto-chevron {
diff --git a/tools/droiddoc/templates-sdk-refonly/components/masthead.cs b/tools/droiddoc/templates-sdk-refonly/components/masthead.cs
index 3a0f970..1eacf75 100644
--- a/tools/droiddoc/templates-sdk-refonly/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk-refonly/components/masthead.cs
@@ -138,7 +138,18 @@
<li class="dac-nav-item develop">
<a class="dac-nav-link has-subnav" href="/reference/packages.html" zh-tw-lang="參考資源"
zh-cn-lang="参考" ru-lang="Справочник" ko-lang="참조문서" ja-lang="リファレンス"
- es-lang="Referencia">Android <?cs var:sdk.version ?> r<?cs var:sdk.rel.id ?></a>
+ es-lang="Referencia">API Reference</a>
+ <div class="dac-nav-secondary develop">
+ <h1 style="font-size: 20px; line-height: 24px; margin: 20px; color:#444"
+ ><?cs
+ if:sdk.preview
+ ?>Android <?cs var:sdk.codename ?>
+ Preview <?cs var:sdk.preview.version ?><?cs
+ else
+ ?>Android <?cs var:sdk.version ?>
+ r<?cs var:sdk.rel.id ?><?cs
+ /if ?></h1>
+ </div>
</li>
</ul>
</nav>
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index d493566..ccaa007 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -8497,12 +8497,12 @@
$spritesheet: width height image $spritesheet-sprites;
*/
.dac-sprite, #tb li:before, #qv li:before {
- background-image: url(/assets/images/sprite.png);
+ background-image: url(../../assets/images/sprite.png);
display: inline-block;
vertical-align: middle; }
@media screen and (min-device-pixel-ratio: 1.5) {
.dac-sprite, #tb li:before, #qv li:before {
- background-image: url(/assets/images/sprite-2x.png);
+ background-image: url(../../assets/images/sprite-2x.png);
background-size: 50% 50%; } }
.dac-sprite.dac-auto-chevron {