From b28bc7e67cf600c0e41e6a83ec6b57382a6b76fc Mon Sep 17 00:00:00 2001
From: Nan Zhang <nanzhang@google.com>
Date: Wed, 13 Jun 2018 17:47:05 -0700
Subject: [PATCH] Add Metalava based android.jar targets in Androi.bp

Test: m -j metalava_android_stubs_current
Bug: b/78245848
Change-Id: I5720659a72a91a08aebc4631e23001384fdf8264
---
 build/Android.bp | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/build/Android.bp b/build/Android.bp
index 7e5cbefda..65a5cadb4 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -35,6 +35,17 @@ java_library_static {
     defaults: ["framework-stubs-default"],
 }
 
+java_library_static {
+    name: "metalava_android_stubs_current",
+    srcs: [
+        ":metalava-api-stubs-docs",
+    ],
+    libs: [
+        "stub-annotations",
+    ],
+    defaults: ["framework-stubs-default"],
+}
+
 java_system_modules {
     name: "android_stubs_current_system_modules",
     libs: ["android_stubs_current"],
@@ -48,6 +59,17 @@ java_library_static {
     defaults: ["framework-stubs-default"],
 }
 
+java_library_static {
+    name: "metalava_android_system_stubs_current",
+    srcs: [
+        ":metalava-system-api-stubs-docs",
+    ],
+    libs: [
+        "stub-annotations",
+    ],
+    defaults: ["framework-stubs-default"],
+}
+
 java_system_modules {
     name: "android_system_stubs_current_system_modules",
     libs: ["android_system_stubs_current"],
@@ -61,6 +83,17 @@ java_library_static {
     defaults: ["framework-stubs-default"],
 }
 
+java_library_static {
+    name: "metalava_android_test_stubs_current",
+    srcs: [
+        ":metalava-test-api-stubs-docs",
+    ],
+    libs: [
+        "stub-annotations",
+    ],
+    defaults: ["framework-stubs-default"],
+}
+
 java_system_modules {
     name: "android_test_stubs_current_system_modules",
     libs: ["android_test_stubs_current"],