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: I3b78fcbcacc3df787e171d6eedeef1e51b087615
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
(cherry picked from 8b864fb45ce79051437f13c2a19510718ea3b7aa)
diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 8ae30a5..d07a70c 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -34,7 +34,7 @@
],
libs: [
"framework-tethering.impl",
- "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 6c05b11..c8becce 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -30,11 +30,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 fccc690..45c7b65 100644
--- a/Tethering/tests/unit/Android.bp
+++ b/Tethering/tests/unit/Android.bp
@@ -60,7 +60,7 @@
"framework-minus-apex",
"framework-res",
"framework-tethering.impl",
- "framework-wifi-stubs-module_libs_api",
+ "framework-wifi.stubs.module_lib",
],
jni_libs: [
// For mockito extended