diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp
index 34fe22879ca9a..48e7ec760f972 100644
--- a/apex/media/framework/Android.bp
+++ b/apex/media/framework/Android.bp
@@ -92,6 +92,7 @@ stubs_defaults {
         // TODO(b/135922046) remove this
         include_dirs: ["frameworks/base/core/java"],
     },
+    dist: { dest: "framework-media.txt" },
 }
 
 droidstubs {
@@ -130,18 +131,21 @@ java_library {
     name: "framework-media-stubs-publicapi",
     srcs: [":framework-media-stubs-srcs-publicapi"],
     defaults: ["framework-module-stubs-lib-defaults-publicapi"],
+    dist: { dest: "framework-media.jar" },
 }
 
 java_library {
     name: "framework-media-stubs-systemapi",
     srcs: [":framework-media-stubs-srcs-systemapi"],
     defaults: ["framework-module-stubs-lib-defaults-systemapi"],
+    dist: { dest: "framework-media.jar" },
 }
 
 java_library {
     name: "framework-media-stubs-module_libs_api",
     srcs: [":framework-media-stubs-srcs-module_libs_api"],
     defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
+    dist: { dest: "framework-media.jar" },
 }
 
 java_library {
diff --git a/apex/permission/framework/Android.bp b/apex/permission/framework/Android.bp
index fc9052e8beac6..3119b7d29b362 100644
--- a/apex/permission/framework/Android.bp
+++ b/apex/permission/framework/Android.bp
@@ -46,6 +46,7 @@ stubs_defaults {
     name: "framework-permission-stubs-defaults",
     srcs: [ ":framework-permission-sources" ],
     libs: [ "framework-annotations-lib" ],
+    dist: { dest: "framework-permission.txt" },
 }
 
 droidstubs {
@@ -84,16 +85,19 @@ java_library {
     name: "framework-permission-stubs-publicapi",
     srcs: [ ":framework-permission-stubs-srcs-publicapi" ],
     defaults: ["framework-module-stubs-lib-defaults-publicapi"],
+    dist: { dest: "framework-permission.jar" },
 }
 
 java_library {
     name: "framework-permission-stubs-systemapi",
     srcs: [ ":framework-permission-stubs-srcs-systemapi" ],
     defaults: ["framework-module-stubs-lib-defaults-systemapi"],
+    dist: { dest: "framework-permission.jar" },
 }
 
 java_library {
     name: "framework-permission-stubs-module_libs_api",
     srcs: [ ":framework-permission-stubs-srcs-module_libs_api" ],
     defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
+    dist: { dest: "framework-permission.jar" },
 }
diff --git a/apex/permission/service/Android.bp b/apex/permission/service/Android.bp
index 2eb7e99a9dab2..2d92d00b6309b 100644
--- a/apex/permission/service/Android.bp
+++ b/apex/permission/service/Android.bp
@@ -41,12 +41,14 @@ droidstubs {
     name: "service-permission-stubs-srcs",
     srcs: [ ":service-permission-sources" ],
     defaults: ["service-module-stubs-srcs-defaults"],
-    visibility: ["//visibility:private"]
+    visibility: ["//visibility:private"],
+    dist: { dest: "service-permission.txt" },
 }
 
 java_library {
     name: "service-permission-stubs",
     srcs: [":service-permission-stubs-srcs"],
     defaults: ["service-module-stubs-defaults"],
-    visibility: ["//frameworks/base/services/core"]
+    visibility: ["//frameworks/base/services/core"],
+    dist: { dest: "service-permission.jar" },
 }
diff --git a/apex/sdkextensions/framework/Android.bp b/apex/sdkextensions/framework/Android.bp
index 3eabb88fec7dd..6a787116c005f 100644
--- a/apex/sdkextensions/framework/Android.bp
+++ b/apex/sdkextensions/framework/Android.bp
@@ -48,6 +48,7 @@ stubs_defaults {
     name: "framework-sdkextensions-stubs-defaults",
     srcs: [ ":framework-sdkextensions-sources" ],
     libs: [ "framework-annotations-lib" ],
+    dist: { dest: "framework-sdkextensions.txt" },
 }
 
 droidstubs {
@@ -55,7 +56,7 @@ droidstubs {
     defaults: [
         "framework-module-stubs-defaults-publicapi",
         "framework-sdkextensions-stubs-defaults",
-    ]
+    ],
 }
 
 droidstubs {
@@ -63,7 +64,7 @@ droidstubs {
     defaults: [
         "framework-module-stubs-defaults-systemapi",
         "framework-sdkextensions-stubs-defaults",
-    ]
+    ],
 }
 
 droidstubs {
@@ -71,7 +72,7 @@ droidstubs {
     defaults: [
         "framework-module-api-defaults-module_libs_api",
         "framework-sdkextensions-stubs-defaults",
-    ]
+    ],
 }
 
 droidstubs {
@@ -79,7 +80,7 @@ droidstubs {
     defaults: [
         "framework-module-stubs-defaults-module_libs_api",
         "framework-sdkextensions-stubs-defaults",
-    ]
+    ],
 }
 
 java_library {
@@ -89,7 +90,8 @@ java_library {
     visibility: [
         "//frameworks/base", // Framework
         "//frameworks/base/apex/sdkextensions", // sdkextensions SDK
-    ]
+    ],
+    dist: { dest: "framework-sdkextensions.jar" },
 }
 
 java_library {
@@ -99,7 +101,8 @@ java_library {
     visibility: [
         "//frameworks/base", // Framework
         "//frameworks/base/apex/sdkextensions", // sdkextensions SDK
-    ]
+    ],
+    dist: { dest: "framework-sdkextensions.jar" },
 }
 
 java_library {
@@ -109,5 +112,6 @@ java_library {
     visibility: [
         "//frameworks/base", // Framework
         "//frameworks/base/apex/sdkextensions", // sdkextensions SDK
-    ]
+    ],
+    dist: { dest: "framework-sdkextensions.jar" },
 }
diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index 6f29141f582c2..7d0f2ee274cd5 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -84,6 +84,7 @@ stubs_defaults {
         "framework-annotations-lib",
     ],
     sdk_version: "system_current",
+    dist: { dest: "framework-statsd.txt" },
 }
 
 droidstubs {
@@ -100,7 +101,6 @@ droidstubs {
         "framework-module-stubs-defaults-systemapi",
         "framework-statsd-stubs-srcs-defaults",
     ],
-
 }
 
 droidstubs {
@@ -127,6 +127,7 @@ java_library {
         "//frameworks/base", // Framework
         "//frameworks/base/apex/statsd", // statsd apex
     ],
+    dist: { dest: "framework-statsd.jar" },
 }
 
 java_library {
@@ -137,6 +138,7 @@ java_library {
         "//frameworks/base", // Framework
         "//frameworks/base/apex/statsd", // statsd apex
     ],
+    dist: { dest: "framework-statsd.jar" },
 }
 
 java_library {
@@ -149,6 +151,7 @@ java_library {
         "//frameworks/opt/net/wifi/service", // wifi service
         "//packages/providers/MediaProvider", // MediaProvider apk
     ],
+    dist: { dest: "framework-statsd.jar" },
 }
 
 android_test {
diff --git a/packages/Tethering/common/TetheringLib/Android.bp b/packages/Tethering/common/TetheringLib/Android.bp
index b520bc8808215..8ae1593949f1b 100644
--- a/packages/Tethering/common/TetheringLib/Android.bp
+++ b/packages/Tethering/common/TetheringLib/Android.bp
@@ -67,6 +67,7 @@ java_library {
 stubs_defaults {
     name: "framework-tethering-stubs-defaults",
     srcs: [":framework-tethering-srcs"],
+    dist: { dest: "framework-tethering.txt" },
 }
 
 filegroup {
@@ -123,16 +124,19 @@ java_library {
     name: "framework-tethering-stubs-publicapi",
     srcs: [":framework-tethering-stubs-srcs-publicapi"],
     defaults: ["framework-module-stubs-lib-defaults-publicapi"],
+    dist: { dest: "framework-tethering.jar" },
 }
 
 java_library {
     name: "framework-tethering-stubs-systemapi",
     srcs: [":framework-tethering-stubs-srcs-systemapi"],
     defaults: ["framework-module-stubs-lib-defaults-systemapi"],
+    dist: { dest: "framework-tethering.jar" },
 }
 
 java_library {
     name: "framework-tethering-stubs-module_libs_api",
     srcs: [":framework-tethering-stubs-srcs-module_libs_api"],
     defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
+    dist: { dest: "framework-tethering.jar" },
 }
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 99beb7bfa043c..6a8600a5baa44 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -134,6 +134,7 @@ stubs_defaults {
         "framework-wifi-util-lib",
     ],
     sdk_version: "module_current",
+    dist: { dest: "framework-wifi.txt" },
 }
 
 droidstubs {
@@ -172,6 +173,7 @@ java_library {
     name: "framework-wifi-stubs-publicapi",
     srcs: [":framework-wifi-stubs-srcs-publicapi"],
     defaults: ["framework-module-stubs-lib-defaults-publicapi"],
+    dist: { dest: "framework-wifi.jar" },
 }
 
 java_library {
@@ -179,6 +181,7 @@ java_library {
     srcs: [":framework-wifi-stubs-srcs-systemapi"],
     libs: ["framework-annotations-lib"],
     defaults: ["framework-module-stubs-lib-defaults-systemapi"],
+    dist: { dest: "framework-wifi.jar" },
 }
 
 java_library {
@@ -186,6 +189,7 @@ java_library {
     srcs: [":framework-wifi-stubs-srcs-module_libs_api"],
     libs: ["framework-annotations-lib"],
     defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
+    dist: { dest: "framework-wifi.jar" },
 }
 
 // defaults for tests that need to build against framework-wifi's @hide APIs