From 708d1211df53c14ccae0e1c2e1da5cf21a429995 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Sat, 8 Feb 2020 20:39:59 +0000
Subject: [PATCH] Tweak module_libs stub build rules

- Don't depend on framework-all (we depend on srcs)
- Set sdk_version to core_current

Bug: 146757305
Test: m
Change-Id: I9f14d35ba657045e99190b7a651781a5b87d490d
Merged-In: I9f14d35ba657045e99190b7a651781a5b87d490d
---
 StubLibraries.bp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 232a7cfd47023..b13391c36a2ac 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -186,7 +186,6 @@ droidstubs {
 droidstubs {
     name: "module-lib-api",
     defaults: ["metalava-api-stubs-default"],
-    libs: ["framework-all"],
     arg_files: ["core/res/AndroidManifest.xml"],
     args: metalava_framework_docs_args + module_libs,
     check_api: {
@@ -218,7 +217,6 @@ droidstubs {
 droidstubs {
     name: "module-lib-api-stubs-docs",
     defaults: ["metalava-api-stubs-default"],
-    libs: ["framework-all"],
     arg_files: ["core/res/AndroidManifest.xml"],
     args: metalava_framework_docs_args + priv_apps + module_libs,
 }
@@ -295,12 +293,12 @@ java_library_static {
     ],
     libs: [
         "stub-annotations",
-        "framework-all",
     ],
     static_libs: [
         "private-stub-annotations-jar",
     ],
     defaults: ["framework-stubs-default"],
+    sdk_version: "core_current",
 }
 
 /////////////////////////////////////////////////////////////////////