diff options
| author | smain@google.com <smain@google.com> | 2015-04-14 02:44:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-14 02:44:14 +0000 |
| commit | c9393a5d707529a465fe68ee96d9929deb8ef3c8 (patch) | |
| tree | f35efb1062b99df278202cc098d31896d8af6168 /Android.mk | |
| parent | f828c92c5ebbcba3204581b49e91b5b80f8ed2b4 (diff) | |
| parent | 2b92e18b4bf70c88662dfa1137c4901daae4d4d5 (diff) | |
| download | frameworks_base-c9393a5d707529a465fe68ee96d9929deb8ef3c8.zip frameworks_base-c9393a5d707529a465fe68ee96d9929deb8ef3c8.tar.gz frameworks_base-c9393a5d707529a465fe68ee96d9929deb8ef3c8.tar.bz2 | |
am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs
* commit '2b92e18b4bf70c88662dfa1137c4901daae4d4d5':
initial batch of NDK files for skeleton site build
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -994,13 +994,13 @@ 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_DROIDDOC_HTML_DIR:=docs/html-ndk 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_MODULE := online-ndk LOCAL_DROIDDOC_OPTIONS:= \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ |