Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
diff --git a/core/definitions.mk b/core/definitions.mk
index 7336c74..06db960 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -269,7 +269,7 @@
define all-renderscript-files-under
$(patsubst ./%,%, \
$(shell cd $(LOCAL_PATH) ; \
- find $(1) -name "*.rs" -and -not -name ".*") \
+ find $(1) \( -name "*.rs" -or -name "*.fs" \) -and -not -name ".*") \
)
endef
diff --git a/core/java.mk b/core/java.mk
index 66f9a02..99e67f4 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -133,8 +133,9 @@
###############################################################
## .rs files: RenderScript sources to .java files and .bc files
+## .fs files: Filterscript sources to .java files and .bc files
###############################################################
-renderscript_sources := $(filter %.rs,$(LOCAL_SRC_FILES))
+renderscript_sources := $(filter %.rs %.fs,$(LOCAL_SRC_FILES))
# Because names of the java files from RenderScript are unknown until the
# .rs file(s) are compiled, we have to depend on a timestamp file.
RenderScript_file_stamp :=
@@ -196,7 +197,7 @@
# include the dependency files (.d) generated by llvm-rs-cc.
renderscript_generated_dep_files := $(addprefix $(renderscript_intermediate)/, \
- $(patsubst %.rs,%.d, $(notdir $(renderscript_sources))))
+ $(patsubst %.fs,%.d, $(patsubst %.rs,%.d, $(notdir $(renderscript_sources)))))
-include $(renderscript_generated_dep_files)
LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp)
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 09e6450..f3a014d 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -3369,7 +3369,7 @@
}
#header-wrap.quicknav {
- height:170px;
+ height:196px;
}
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index d98af85..025d076 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -119,10 +119,12 @@
<ul>
<li class="design">
<ul>
+ <li><a href="<?cs var:toroot ?>design/index.html">Get Started</a></li>
<li><a href="<?cs var:toroot ?>design/style/index.html">Style</a></li>
<li><a href="<?cs var:toroot ?>design/patterns/index.html">Patterns</a></li>
<li><a href="<?cs var:toroot ?>design/building-blocks/index.html">Building Blocks</a></li>
<li><a href="<?cs var:toroot ?>design/downloads/index.html">Downloads</a></li>
+ <li><a href="<?cs var:toroot ?>design/videos/index.html">Videos</a></li>
</ul>
</li>
<li class="develop">
@@ -169,9 +171,9 @@
<li><a href="<?cs var:toroot ?>distribute/index.html">Google Play</a></li>
<li><a href="<?cs var:toroot ?>distribute/googleplay/publish/index.html">Publishing</a></li>
<li><a href="<?cs var:toroot ?>distribute/googleplay/promote/index.html">Promoting</a></li>
- <!--<li><a href="<?cs var:toroot ?>distribute/googleplay/strategies/index.html">Strategies</a></li> -->
- <li><a href="<?cs var:toroot ?>distribute/open.html">Open
-Distribution</a></li>
+ <li><a href="<?cs var:toroot ?>distribute/googleplay/quality/index.html">App Quality</a></li>
+ <li><a href="<?cs var:toroot ?>distribute/googleplay/spotlight/index.html">Spotlight</a></li>
+ <li><a href="<?cs var:toroot ?>distribute/open.html">Open Distribution</a></li>
</ul>
</li>
</ul>