Rewrite auto prebuilts to external/auto
Remove last references to auto-common and auto-value-annotations.
Bug: 158870037
Test: m checkbuild
Change-Id: I64d22f1492246ff31da5966e2f47e8a89cf54182
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py
index 98440dd..e17f1fa 100755
--- a/update_prebuilts/update_prebuilts.py
+++ b/update_prebuilts/update_prebuilts.py
@@ -332,6 +332,8 @@
args.append("-static-deps")
rewriteNames = sorted([name for name in maven_to_make if ":" in name] + [name for name in maven_to_make if ":" not in name])
args.extend(["-rewrite=^" + name + "$=" + maven_to_make[name]['name'] for name in rewriteNames])
+ args.extend(["-rewrite=^auto-common$=auto_common"])
+ args.extend(["-rewrite=^auto-value-annotations$=auto_value_annotations"])
args.extend(["-rewrite=^monitor$=androidx.test.monitor"])
args.extend(["-rewrite=^rules$=androidx.test.rules"])
args.extend(["-rewrite=^runner$=androidx.test.runner"])