From 037d7fb498c629e16af26f22b65808aed364acab Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 25 Mar 2021 17:01:55 -0700
Subject: [PATCH] Use framework-annotation-libs for hwbinder-stubs-docs

hwbinder.stubs and hwbinder-stubs-docs use SystemApi annotations.
Provide an explicit definition of SystemApi to metalava by adding
framework-annotations-libs to libs so it doesn't find it on its
own without a dependency.  Replace stub-annotations with
framework-annotations-libs in hwbinder.stubs for consistency.

Bug: 153703940
Test: m hwbinder.stubs
Change-Id: I777d68e446f8c7c1064667fd7c07b1e2ee6bfb1b
---
 StubLibraries.bp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index fd614a7e3dc3b..6316c4a6f19fb 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -434,6 +434,7 @@ droidstubs {
         "core/java/android/os/RemoteException.java",
         "core/java/android/util/AndroidException.java",
     ],
+    libs: ["framework-annotations-lib"],
     installable: false,
     sdk_version: "core_platform",
     annotations_enabled: true,
@@ -447,7 +448,7 @@ droidstubs {
 java_library_static {
     name: "hwbinder.stubs",
     sdk_version: "core_current",
-    libs: ["stub-annotations"],
+    libs: ["framework-annotations-lib"],
     srcs: [
         ":hwbinder-stubs-docs",
     ],