Merge "Tweak module_libs stub build rules" am: a659cb4a0b

Change-Id: Ic5d705635a06ef8b735187b2d3aa33be2d2ce9ec

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",
 }
 
 /////////////////////////////////////////////////////////////////////