diff options
| author | Johan Euphrosine <proppy@google.com> | 2015-05-27 21:41:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-27 21:41:20 +0000 |
| commit | e35e60801560a757deb708e6ca47b962202dcc0b (patch) | |
| tree | 7331e9e49adcf2eb71a2c99e61f11e7861992eb1 | |
| parent | f9c83b8f889cb3409d60bdfce71d8c6a8ad39941 (diff) | |
| parent | 738fc3a722cc2c753b591298e70b0f86c481bba2 (diff) | |
| download | frameworks_native-e35e60801560a757deb708e6ca47b962202dcc0b.zip frameworks_native-e35e60801560a757deb708e6ca47b962202dcc0b.tar.gz frameworks_native-e35e60801560a757deb708e6ca47b962202dcc0b.tar.bz2 | |
am 738fc3a7: Merge "framework/native/docs: remove doc footer for jd output"
* commit '738fc3a722cc2c753b591298e70b0f86c481bba2':
framework/native/docs: remove doc footer for jd output
| -rw-r--r-- | docs/Doxyfile | 2 | ||||
| -rw-r--r-- | docs/Makefile | 5 | ||||
| -rw-r--r-- | docs/footer.jd | 0 |
3 files changed, 3 insertions, 4 deletions
diff --git a/docs/Doxyfile b/docs/Doxyfile index ce12d81..46d6d84 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 356b2ce..5104d81 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 0000000..e69de29 --- /dev/null +++ b/docs/footer.jd |