commit e379f408933b2945285b36f3d6baede8b11f92b8
author Nan Zhang <nanzhang@google.com> Wed Aug 01 15:07:38 2018 -0700
committer Nan Zhang <nanzhang@google.com> Wed Aug 01 22:19:48 2018 +0000
tree 709c74e095b92b8a64841cbcb809a503dfc84cdc
parent c14a4be7998b18ce7caea2b63ef30ca09868d1f7

Depend on a module instead of real dir for metalava_merge_annotations_dirs

Bug: b/111916275
Test: touch manual/android/support/design/widget/annotations.xml, and m
-j metalava-api-stubs-docs, and check the built output srcjar.

Change-Id: I82e8b51d66f97ebc3f9f4f5aa75ce33066c95089

Android.bp

diff --git a/Android.bp b/Android.bp
index 80afd48..d974b7e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1142,7 +1142,7 @@
     metalava_annotations_enabled: true,
     metalava_previous_api: ":public-api-for-metalava-annotations",
     metalava_merge_annotations_dirs: [
-        "tools/metalava/manual",
+        "metalava-manual",
     ],
 }