Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b am: 672fa36bdd

Original change: undetermined Change-Id: I0d9dcedb3c6d9ed7bf98de86b48e49d620349c87
2020-06-02 12:11:55 +00:00
parent c6f11fabb8 672fa36bdd
commit d8e8bb100d
3 changed files with 2 additions and 7 deletions
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -34,7 +34,7 @@ java_defaults {
    ],
    libs: [
        "framework-tethering.impl",
-        "framework-wifi-stubs-systemapi",
+        "framework-wifi",
        "unsupportedappusage",
    ],
    plugins: ["java_api_finder"],
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/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,

--- a/Tethering/tests/unit/Android.bp
+++ b/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