| commit | 2ba0df0374e79f0196293431bcbacd555a10b688 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Mar 08 21:59:09 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 08 21:59:13 2017 +0000 |
| tree | 7658172d6f7dbd1ee8264b51439caca078fdedc6 | |
| parent | 3660504f149c9b7641d33d14bfc2eaa2ab84bd8a [diff] | |
| parent | bd401a77f8e1e132fb2f632086a435dac71303bf [diff] |
Merge "update uiautomator doclava build to use new location for templates as per: https://googleplex-android-review.git.corp.google.com/#/c/1524290/"
diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk index f932388..e70bd11 100644 --- a/cmds/uiautomator/library/Android.mk +++ b/cmds/uiautomator/library/Android.mk
@@ -49,7 +49,7 @@ -api $(uiautomator_internal_api_file) \ -removedApi $(uiautomator_internal_removed_api_file) -LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := build/tools/droiddoc/templates-sdk +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := external/doclava/res/assets/templates-sdk LOCAL_UNINSTALLABLE_MODULE := true LOCAL_MODULE := uiautomator-stubs