Switch to standard naming scheme
Removes use of the special framework-modules naming scheme.
Bug: 155164730
Test: m java
Exempt-From-Owner-Approval: Build cleanup.
Change-Id: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index ad903e0..93e41a3 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -35,7 +35,7 @@
libs: [
"framework-tethering.impl",
"framework-telephony-stubs",
- "framework-wifi-stubs-systemapi",
+ "framework-wifi",
"unsupportedappusage",
],
plugins: ["java_api_finder"],
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index 408725c..a631a88 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -20,11 +20,6 @@
":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/Tethering/tests/unit/Android.bp b/Tethering/tests/unit/Android.bp
index 4e3048e..0413714 100644
--- a/Tethering/tests/unit/Android.bp
+++ b/Tethering/tests/unit/Android.bp
@@ -61,7 +61,7 @@
"framework-res",
"framework-telephony-stubs",
"framework-tethering.impl",
- "framework-wifi-stubs-module_libs_api",
+ "framework-wifi.stubs.module_lib",
],
jni_libs: [
// For mockito extended