From c79472e2d2fea9a65553ab36f50bea9740d104f8 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Sat, 16 May 2020 16:25:31 +0100
Subject: [PATCH] Remove framework annotations from appsearch stubs

They should be in the classpath, not compiled statically into the stubs.

Bug: 144149403
Test: m framework-appsearch-stubs + followup CL
Change-Id: I8521f131e0f9e79d4d24870c2866783245bc8488
---
 apex/appsearch/framework/Android.bp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apex/appsearch/framework/Android.bp b/apex/appsearch/framework/Android.bp
index 56993fd47884d..321f471c3c8b9 100644
--- a/apex/appsearch/framework/Android.bp
+++ b/apex/appsearch/framework/Android.bp
@@ -58,10 +58,8 @@ metalava_appsearch_docs_args =
 
 droidstubs {
     name: "framework-appsearch-stubs-srcs",
-    srcs: [
-        ":framework-annotations",
-        ":framework-appsearch-sources",
-    ],
+    srcs: [":framework-appsearch-sources"],
+    libs: ["framework-annotations-lib"],
     aidl: {
         include_dirs: ["frameworks/base/core/java"],
     },