From 89c77f53d2d70cb265ac8ce831155032a55e1a51 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 3 Feb 2020 15:11:10 +0000
Subject: Create all variants of stubs for sdkextensions

Add module_libs_api stubs for sdkextensions, and tweak the naming
of the existing targets to follow a better convention.

Bug: 147768409
Test: m
Change-Id: Ie3ae677aa0334a4263f0899929c9a9657caf7bc2
---
 apex/sdkextensions/framework/Android.bp | 58 ++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/apex/sdkextensions/framework/Android.bp b/apex/sdkextensions/framework/Android.bp
index 245a96b99148..86f4ab7c1128 100644
--- a/apex/sdkextensions/framework/Android.bp
+++ b/apex/sdkextensions/framework/Android.bp
@@ -44,34 +44,68 @@ java_library {
     ],
 }
 
+stubs_defaults {
+    name: "framework-sdkextensions-stubs-defaults",
+    srcs: [ ":framework-sdkextensions-sources" ],
+    libs: [ "framework-annotations-lib" ],
+    sdk_version: "system_current",
+}
+
 droidstubs {
-    name: "framework-sdkextensions-droidstubs-publicapi",
+    name: "framework-sdkextensions-stubs-srcs-publicapi",
     defaults: [
-        "framework-sdkextensions-stubs-defaults",
         "framework-module-stubs-defaults-publicapi",
+        "framework-sdkextensions-stubs-defaults",
     ]
 }
 
 droidstubs {
-    name: "framework-sdkextensions-droidstubs-systemapi",
+    name: "framework-sdkextensions-stubs-srcs-systemapi",
     defaults: [
-        "framework-sdkextensions-stubs-defaults",
         "framework-module-stubs-defaults-systemapi",
+        "framework-sdkextensions-stubs-defaults",
     ]
 }
 
-stubs_defaults {
-    name: "framework-sdkextensions-stubs-defaults",
-    srcs: [
-        ":framework-sdkextensions-sources",
-        ":framework-annotations",
-    ],
-    sdk_version: "system_current",
+droidstubs {
+    name: "framework-sdkextensions-api-module_libs_api",
+    defaults: [
+        "framework-module-api-defaults-module_libs_api",
+        "framework-sdkextensions-stubs-defaults",
+    ]
+}
+
+droidstubs {
+    name: "framework-sdkextensions-stubs-srcs-module_libs_api",
+    defaults: [
+        "framework-module-stubs-defaults-module_libs_api",
+        "framework-sdkextensions-stubs-defaults",
+    ]
+}
+
+java_library {
+    name: "framework-sdkextensions-stubs-publicapi",
+    srcs: [":framework-sdkextensions-stubs-srcs-publicapi"],
+    sdk_version: "current",
+    visibility: [
+        "//frameworks/base", // Framework
+        "//frameworks/base/apex/sdkextensions", // sdkextensions SDK
+    ]
 }
 
 java_library {
     name: "framework-sdkextensions-stubs-systemapi",
-    srcs: [":framework-sdkextensions-droidstubs-systemapi"],
+    srcs: [":framework-sdkextensions-stubs-srcs-systemapi"],
+    sdk_version: "system_current",
+    visibility: [
+        "//frameworks/base", // Framework
+        "//frameworks/base/apex/sdkextensions", // sdkextensions SDK
+    ]
+}
+
+java_library {
+    name: "framework-sdkextensions-stubs-module_libs_api",
+    srcs: [":framework-sdkextensions-stubs-srcs-module_libs_api"],
     sdk_version: "system_current",
     visibility: [
         "//frameworks/base", // Framework
-- 
cgit v1.2.3-59-g8ed1b