summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2015-04-11 02:27:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-11 02:27:01 +0000
commitd34b20e957f66e113e7d39e253d69450545b5961 (patch)
tree2d8812e52c3d2ed9e5b0928551d8438ed1477b79
parent93976df800641c9d56b73af6cb4bab9cc9a5f59e (diff)
parenta22125ff98085c0fe662966cadfe4c889707db54 (diff)
downloadframeworks_base-d34b20e957f66e113e7d39e253d69450545b5961.zip
frameworks_base-d34b20e957f66e113e7d39e253d69450545b5961.tar.gz
frameworks_base-d34b20e957f66e113e7d39e253d69450545b5961.tar.bz2
am a22125ff: am 23b5e508: am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit 'a22125ff98085c0fe662966cadfe4c889707db54': New build rule reflecting different masthead, side nav for NDK minisite.
-rw-r--r--Android.mk29
1 files changed, 29 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 02e3756..e56b383 100644
--- a/Android.mk
+++ b/Android.mk
@@ -986,6 +986,35 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $(BUILD_DROIDDOC)
+# ==== docs for the ndk =======================
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
+LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
+LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)
+LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
+LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
+LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
+LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
+LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
+# specify a second html input dir and an output path relative to OUT_DIR)
+LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl/intl /
+
+LOCAL_MODULE := ndk
+
+LOCAL_DROIDDOC_OPTIONS:= \
+ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
+ -toroot / \
+ -hdf android.whichdoc online \
+ $(sample_groups) \
+ -hdf android.hasSamples true \
+ -samplesdir $(samples_dir)
+
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-ndk
+
+include $(BUILD_DROIDDOC)
+
+
# ==== docs that have all of the stuff that's @hidden =======================
include $(CLEAR_VARS)