commit 12a07676eda9bfc4a9377ab2f63ef019276dc937
author Anton Hansson <hansson@google.com> Mon Feb 03 15:19:59 2020 +0000
committer Anton Hansson <hansson@google.com> Mon Feb 03 19:03:21 2020 +0000
tree 6e4dda9ebcf57e90cb1a81c7a7c56b1c4f9e2d8d
parent d1ab76705a30663a81101bcf8361770c94f8330f

Create all variants of stubs for media

Add separate publicapi, systemapi and module_libs stubs for media,
and rename the updatable_media stubs to framework-media to match
the others. The impl jar still has the name updatable_media.

Bug: 147768409
Test: m
Test: m framework-media-stubs-{public,system,module_libs_}api
Change-Id: I498823de7315f78121975d36d6dc7667a8245085

Android.bp

diff --git a/Android.bp b/Android.bp
index c899179..1ef7243 100644
--- a/Android.bp
+++ b/Android.bp
@@ -401,7 +401,7 @@
         "app-compat-annotations",
         "ext",
         "unsupportedappusage",
-        "updatable_media_stubs",
+        "framework-media-stubs-systemapi",
         "framework_mediaprovider_stubs",
         "framework-tethering",
         "framework-telephony-stubs",
@@ -517,7 +517,7 @@
     installable: false, // this lib is a build-only library
     static_libs: [
         "framework-minus-apex",
-        "updatable_media_stubs",
+        "framework-media-stubs-systemapi",
         "framework_mediaprovider_stubs",
         "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs
         "framework-permission-stubs",

apex/media/framework/Android.bp

diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp
index 2266d04..91df098 100644
--- a/apex/media/framework/Android.bp
+++ b/apex/media/framework/Android.bp
@@ -99,13 +99,10 @@
     path: "java"
 }
 
-droidstubs {
-    name: "updatable-media-stubs",
-    srcs: [
-        ":updatable-media-srcs",
-        ":framework-media-annotation-srcs",
-    ],
-    defaults: [ "framework-module-stubs-defaults-systemapi" ],
+stubs_defaults {
+    name: "framework-media-stubs-srcs-defaults",
+    srcs: [ ":updatable-media-srcs" ],
+    libs: [ "framework_media_annotation" ],
     aidl: {
         // TODO(b/135922046) remove this
         include_dirs: ["frameworks/base/core/java"],
@@ -113,9 +110,53 @@
     sdk_version: "system_current",
 }
 
+droidstubs {
+    name: "framework-media-stubs-srcs-publicapi",
+    defaults: [
+        "framework-media-stubs-srcs-defaults",
+        "framework-module-stubs-defaults-publicapi",
+    ],
+}
+
+droidstubs {
+    name: "framework-media-stubs-srcs-systemapi",
+    defaults: [
+        "framework-media-stubs-srcs-defaults",
+        "framework-module-stubs-defaults-systemapi",
+    ],
+}
+
+droidstubs {
+    name: "framework-media-api-module_libs_api",
+    defaults: [
+        "framework-media-stubs-srcs-defaults",
+        "framework-module-api-defaults-module_libs_api",
+    ],
+}
+
+droidstubs {
+    name: "framework-media-stubs-srcs-module_libs_api",
+    defaults: [
+        "framework-media-stubs-srcs-defaults",
+        "framework-module-stubs-defaults-module_libs_api",
+    ],
+}
+
 java_library {
-    name: "updatable_media_stubs",
-    srcs: [":updatable-media-stubs"],
+    name: "framework-media-stubs-publicapi",
+    srcs: [":framework-media-stubs-srcs-publicapi"],
+    sdk_version: "current",
+}
+
+java_library {
+    name: "framework-media-stubs-systemapi",
+    srcs: [":framework-media-stubs-srcs-systemapi"],
+    sdk_version: "system_current",
+}
+
+java_library {
+    name: "framework-media-stubs-module_libs_api",
+    srcs: [":framework-media-stubs-srcs-module_libs_api"],
     sdk_version: "system_current",
 }