From b78c3a22f7170184039ee6a00f3eea5d01784768 Mon Sep 17 00:00:00 2001
From: Nan Zhang <nanzhang@google.com>
Date: Fri, 13 Jul 2018 16:37:39 -0700
Subject: [PATCH] Wrap private-stub-annotations in android.jar

Test: javap -classpath classes.jar androidx.annotation.RecentlyNullable
Compiled from "RecentlyNullable.java"
interface androidx.annotation.RecentlyNullable extends java.lang.annotation.Annotation {
}
Bug: b/78245848

Change-Id: Ie28dea72e8795277e78a8fb0ff2173ab60c31078
---
 build/Android.bp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build/Android.bp b/build/Android.bp
index 2fd02a6f9..5d7258876 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -44,6 +44,9 @@ java_library_static {
     libs: [
         "stub-annotations",
     ],
+    static_libs: [
+        "private-stub-annotations-jar",
+    ],
     defaults: ["framework-stubs-default"],
 }
 
@@ -68,6 +71,9 @@ java_library_static {
     libs: [
         "stub-annotations",
     ],
+    static_libs: [
+        "private-stub-annotations-jar",
+    ],
     defaults: ["framework-stubs-default"],
 }
 
@@ -92,6 +98,9 @@ java_library_static {
     libs: [
         "stub-annotations",
     ],
+    static_libs: [
+        "private-stub-annotations-jar",
+    ],
     defaults: ["framework-stubs-default"],
 }