commit 01fd6ff91821f2ac9547446dc1362bd12508c261
author Paul Duffin <paulduffin@google.com> Tue Jun 02 11:41:13 2020 +0100
committer Paul Duffin <paulduffin@google.com> Tue Jun 02 14:15:28 2020 +0000
tree b6ad0017dc231661f79a0eb9caa43ee0d701fcf1
parent 3434c93319b85374b9f9a1165b49c5bd15759e30

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: I3896d7c91e937f503b49f5df011c21ee51219652
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
Merged-In: I3b78fcbcacc3df787e171d6eedeef1e51b087615
(cherry picked from 8b864fb45ce79051437f13c2a19510718ea3b7aa)

Android.bp

diff --git a/Android.bp b/Android.bp
index cfdfeb3..aeaaca3d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -372,7 +372,7 @@
     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",

packages/Tethering/common/TetheringLib/Android.bp

diff --git a/packages/Tethering/common/TetheringLib/Android.bp b/packages/Tethering/common/TetheringLib/Android.bp
index 6c05b11..c8becce 100644
--- a/packages/Tethering/common/TetheringLib/Android.bp
+++ b/packages/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,
 

services/Android.bp

diff --git a/services/Android.bp b/services/Android.bp
index 0d221b9..57d9a38 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -72,7 +72,7 @@
 
     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)

services/core/Android.bp

diff --git a/services/core/Android.bp b/services/core/Android.bp
index 74fddb2..9cfa03e 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -30,7 +30,7 @@
         "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: [