summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.bp14
-rw-r--r--StubLibraries.bp28
-rw-r--r--apex/media/framework/Android.bp5
-rw-r--r--apex/permission/framework/Android.bp5
-rw-r--r--apex/statsd/framework/Android.bp5
-rw-r--r--packages/Tethering/Android.bp2
-rw-r--r--packages/Tethering/common/TetheringLib/Android.bp5
-rw-r--r--packages/Tethering/tests/unit/Android.bp2
-rw-r--r--services/Android.bp2
-rw-r--r--services/core/Android.bp2
-rw-r--r--wifi/Android.bp5
11 files changed, 25 insertions, 50 deletions
diff --git a/Android.bp b/Android.bp
index c5797feb0563..e22d4a6a250d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -366,13 +366,13 @@ filegroup {
java_library {
name: "framework-updatable-stubs-module_libs_api",
static_libs: [
- "framework-media-stubs-module_libs_api",
- "framework-mediaprovider-stubs-module_libs_api",
- "framework-permission-stubs-module_libs_api",
- "framework-sdkextensions-stubs-module_libs_api",
- "framework-statsd-stubs-module_libs_api",
- "framework-tethering-stubs-module_libs_api",
- "framework-wifi-stubs-module_libs_api",
+ "framework-media.stubs.module_lib",
+ "framework-mediaprovider.stubs.module_lib",
+ "framework-permission.stubs.module_lib",
+ "framework-sdkextensions.stubs.module_lib",
+ "framework-statsd.stubs.module_lib",
+ "framework-tethering.stubs.module_lib",
+ "framework-wifi.stubs.module_lib",
],
sdk_version: "module_current",
visibility: [":__pkg__"],
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 65c3932864c2..9f5b183913c0 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -337,13 +337,13 @@ java_library_static {
srcs: [ ":api-stubs-docs-non-updatable" ],
static_libs: [
"conscrypt.module.public.api.stubs",
- "framework-media-stubs-publicapi",
- "framework-mediaprovider-stubs-publicapi",
- "framework-permission-stubs-publicapi",
- "framework-sdkextensions-stubs-publicapi",
- "framework-statsd-stubs-publicapi",
- "framework-tethering-stubs-publicapi",
- "framework-wifi-stubs-publicapi",
+ "framework-media.stubs",
+ "framework-mediaprovider.stubs",
+ "framework-permission.stubs",
+ "framework-sdkextensions.stubs",
+ "framework-statsd.stubs",
+ "framework-tethering.stubs",
+ "framework-wifi.stubs",
"private-stub-annotations-jar",
],
defaults: ["android_defaults_stubs_current"],
@@ -367,13 +367,13 @@ java_library_static {
srcs: [ ":system-api-stubs-docs-non-updatable" ],
static_libs: [
"conscrypt.module.public.api.stubs",
- "framework-media-stubs-systemapi",
- "framework-mediaprovider-stubs-systemapi",
- "framework-permission-stubs-systemapi",
- "framework-sdkextensions-stubs-systemapi",
- "framework-statsd-stubs-systemapi",
- "framework-tethering-stubs-systemapi",
- "framework-wifi-stubs-systemapi",
+ "framework-media.stubs.system",
+ "framework-mediaprovider.stubs.system",
+ "framework-permission.stubs.system",
+ "framework-sdkextensions.stubs.system",
+ "framework-statsd.stubs.system",
+ "framework-tethering.stubs.system",
+ "framework-wifi.stubs.system",
"private-stub-annotations-jar",
],
defaults: ["android_defaults_stubs_current"],
diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp
index ac501a510e80..4417b681efc3 100644
--- a/apex/media/framework/Android.bp
+++ b/apex/media/framework/Android.bp
@@ -96,11 +96,6 @@ java_sdk_library {
":updatable-media-srcs",
],
- // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
- // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
- // modules to java_sdk_library.
- naming_scheme: "framework-modules",
-
libs: [
"framework_media_annotation",
],
diff --git a/apex/permission/framework/Android.bp b/apex/permission/framework/Android.bp
index 732caecbd4a7..be553feb1d34 100644
--- a/apex/permission/framework/Android.bp
+++ b/apex/permission/framework/Android.bp
@@ -38,11 +38,6 @@ java_sdk_library {
":framework-permission-sources",
],
- // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
- // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
- // modules to java_sdk_library.
- naming_scheme: "framework-modules",
-
apex_available: [
"com.android.permission",
"test_com.android.permission",
diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index 78496c4074f8..1f479963eaa9 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -51,11 +51,6 @@ java_sdk_library {
defaults: ["framework-module-defaults"],
installable: true,
- // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
- // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
- // modules to java_sdk_library.
- naming_scheme: "framework-modules",
-
srcs: [
":framework-statsd-sources",
],
diff --git a/packages/Tethering/Android.bp b/packages/Tethering/Android.bp
index 4e17a31de141..9eba6bd0dc5a 100644
--- a/packages/Tethering/Android.bp
+++ b/packages/Tethering/Android.bp
@@ -34,7 +34,7 @@ java_defaults {
],
libs: [
"framework-tethering.impl",
- "framework-wifi-stubs-systemapi",
+ "framework-wifi",
"unsupportedappusage",
],
plugins: ["java_api_finder"],
diff --git a/packages/Tethering/common/TetheringLib/Android.bp b/packages/Tethering/common/TetheringLib/Android.bp
index 6c05b11258f0..c8becce7be82 100644
--- a/packages/Tethering/common/TetheringLib/Android.bp
+++ b/packages/Tethering/common/TetheringLib/Android.bp
@@ -30,11 +30,6 @@ java_sdk_library {
":framework-tethering-srcs",
],
- // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
- // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
- // modules to java_sdk_library.
- naming_scheme: "framework-modules",
-
jarjar_rules: "jarjar-rules.txt",
installable: true,
diff --git a/packages/Tethering/tests/unit/Android.bp b/packages/Tethering/tests/unit/Android.bp
index fccc6902e365..45c7b656e28f 100644
--- a/packages/Tethering/tests/unit/Android.bp
+++ b/packages/Tethering/tests/unit/Android.bp
@@ -60,7 +60,7 @@ java_defaults {
"framework-minus-apex",
"framework-res",
"framework-tethering.impl",
- "framework-wifi-stubs-module_libs_api",
+ "framework-wifi.stubs.module_lib",
],
jni_libs: [
// For mockito extended
diff --git a/services/Android.bp b/services/Android.bp
index 882085a7d0ba..00676e332656 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -87,7 +87,7 @@ java_library {
libs: [
"android.hidl.manager-V1.0-java",
- "framework-tethering-stubs-module_libs_api",
+ "framework-tethering.stubs.module_lib",
],
// Uncomment to enable output of certain warnings (deprecated, unchecked)
diff --git a/services/core/Android.bp b/services/core/Android.bp
index a95a0c2eaf28..9e8a8727dc36 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -99,7 +99,7 @@ java_library_static {
"android.hardware.vibrator-java",
"android.net.ipsec.ike.stubs.module_lib",
"app-compat-annotations",
- "framework-tethering-stubs-module_libs_api",
+ "framework-tethering.stubs.module_lib",
"service-permission-stubs",
],
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 0df578f2216b..83b35616286a 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -111,11 +111,6 @@ java_sdk_library {
":framework-wifi-util-lib-aidls",
],
- // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
- // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
- // modules to java_sdk_library.
- naming_scheme: "framework-modules",
-
jarjar_rules: ":wifi-jarjar-rules",
installable: true,
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 04:25:41 +0000