summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNan Zhang <nanzhang@google.com>2018-08-06 18:30:35 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-06 18:30:35 -0700
commitd9cb1b429ae54c54c8d1b06749d34be4ce12f25d (patch)
treefe1f882c2196582981a78d81f59e4516916c6f6d
parent61f6dc4c240b710a9695fa505010f6eeb2472b8b (diff)
parentf8e12c51d49691549efedd32e7adcc58b228826b (diff)
downloadbase-d9cb1b429ae54c54c8d1b06749d34be4ce12f25d.tar.gz
Merge "Depend on a module instead of real dir for metalava_merge_annotations_dirs"
am: f8e12c51d4 Change-Id: Ice53109de35716bbdee921d595f015f16f559b3f
-rw-r--r--Android.bp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 903d5b64a976..eb235d720757 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1567,7 +1567,7 @@ doc_defaults {
metalava_annotations_enabled: true,
metalava_previous_api: ":public-api-for-metalava-annotations",
metalava_merge_annotations_dirs: [
- "tools/metalava/manual",
+ "metalava-manual",
],
}