summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Euphrosine <proppy@google.com>2015-05-27 21:30:37 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-05-27 21:30:37 +0000
commit738fc3a722cc2c753b591298e70b0f86c481bba2 (patch)
tree7331e9e49adcf2eb71a2c99e61f11e7861992eb1
parent116e7aebb68bb0394eb12092db8282981012784e (diff)
parentefd6ab3cb0fcfae7d990582e1176904fb0a6f1b1 (diff)
downloadnative-738fc3a722cc2c753b591298e70b0f86c481bba2.tar.gz
Merge "framework/native/docs: remove doc footer for jd output"android-m-preview
-rw-r--r--docs/Doxyfile2
-rw-r--r--docs/Makefile5
-rw-r--r--docs/footer.jd0
3 files changed, 3 insertions, 4 deletions
diff --git a/docs/Doxyfile b/docs/Doxyfile
index ce12d81d32..46d6d846db 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -948,7 +948,7 @@ HTML_HEADER = $(HTML_HEADER)
# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
-HTML_FOOTER =
+HTML_FOOTER = $(HTML_FOOTER)
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
diff --git a/docs/Makefile b/docs/Makefile
index 356b2ce546..5104d81c20 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -8,7 +8,6 @@ html: $(HEADERS) Doxyfile
jd: $(HEADERS) Doxyfile header.jd
mkdir -p jd
- HTML_HEADER=header.jd HTML_OUTPUT=jd doxygen
- for file in jd/*.html; do mv "$${file}" "$${file/\.html/\.jd}"; done
+ HTML_HEADER=header.jd HTML_FOOTER=footer.jd HTML_OUTPUT=jd doxygen
+ for file in jd/*.html; do mv "$${file}" "$${file/.html/.jd}"; done
rm -f jd/index.jd
-
diff --git a/docs/footer.jd b/docs/footer.jd
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/docs/footer.jd