Merge "Enable api-versions.xml generation for api-stubs"
diff --git a/Android.bp b/Android.bp
index dff7ff7..b2b3dff 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1216,6 +1216,11 @@
         "metalava-manual",
         "ojluni-annotated-sdk-stubs",
     ],
+    api_levels_annotations_enabled: true,
+    api_levels_annotations_dirs: [
+        "sdk-dir",
+        "api-versions-jars-dir",
+    ],
 }
 
 droidstubs {