122452571: Fix path to android.jar in prebuilts
The --android-jar-pattern flag passed to metalava is used to
find all the prebuilts for previous API levels such that
it can compute the exact API level for each class and member.
At some point the prebuilts must have been moved without this
code getting updated.
This fixes
Bug: 122452571: Can't build app with Q prebuilt SDK with minSdkVersion=21
Test: make sdk; inspect api-versions.xml
Change-Id: I25f6203725391dc5404cb8b6049479c9c3da1699
diff --git a/java/droiddoc.go b/java/droiddoc.go
index 0d2842a..babde55 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -1500,7 +1500,7 @@
}
}
*implicits = append(*implicits, androidJars...)
- flags += " --android-jar-pattern " + t.dir.String() + "/%/android.jar "
+ flags += " --android-jar-pattern " + t.dir.String() + "/%/public/android.jar "
} else {
ctx.PropertyErrorf("api_levels_annotations_dirs",
"module %q is not a metalava api-levels-annotations dir", ctx.OtherModuleName(m))