summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp2
-rw-r--r--packages/Tethering/common/TetheringLib/Android.bp5
-rw-r--r--services/Android.bp2
-rw-r--r--services/core/Android.bp2
4 files changed, 3 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index cfdfeb3de0e0..aeaaca3d7705 100644
--- a/Android.bp
+++ b/Android.bp
@@ -372,7 +372,7 @@ java_library {
name: "framework-updatable-stubs-module_libs_api",
static_libs: [
"framework-sdkextensions-stubs-module_libs_api",
- "framework-tethering-stubs-module_libs_api",
+ "framework-tethering.stubs.module_lib",
"updatable_media_stubs",
],
sdk_version: "module_current",
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/services/Android.bp b/services/Android.bp
index 0d221b930f5d..57d9a3850e86 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -72,7 +72,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 74fddb2b630e..9cfa03ed6d5f 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -30,7 +30,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",
],
required: [