From abebc6a89729b79b0d3af45f27f27208df4d2c0f Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Sun, 31 May 2020 11:35:50 +0100 Subject: [PATCH] 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) --- Android.bp | 14 +++++----- StubLibraries.bp | 28 +++++++++---------- apex/media/framework/Android.bp | 5 ---- apex/permission/framework/Android.bp | 5 ---- apex/statsd/framework/Android.bp | 5 ---- packages/Tethering/Android.bp | 2 +- .../Tethering/common/TetheringLib/Android.bp | 5 ---- packages/Tethering/tests/unit/Android.bp | 2 +- services/Android.bp | 2 +- services/core/Android.bp | 2 +- wifi/Android.bp | 5 ---- 11 files changed, 25 insertions(+), 50 deletions(-) diff --git a/Android.bp b/Android.bp index 557c3209248da..632f49da5df97 100644 --- a/Android.bp +++ b/Android.bp @@ -292,13 +292,13 @@ filegroup { java_library { name: "framework-updatable-stubs-module_libs_api", static_libs: [ - "framework-media-stubs-module_libs_api", - "framework-mediaprovider-stubs-module_libs_api", - "framework-permission-stubs-module_libs_api", - "framework-sdkextensions-stubs-module_libs_api", - "framework-statsd-stubs-module_libs_api", - "framework-tethering-stubs-module_libs_api", - "framework-wifi-stubs-module_libs_api", + "framework-media.stubs.module_lib", + "framework-mediaprovider.stubs.module_lib", + "framework-permission.stubs.module_lib", + "framework-sdkextensions.stubs.module_lib", + "framework-statsd.stubs.module_lib", + "framework-tethering.stubs.module_lib", + "framework-wifi.stubs.module_lib", ], sdk_version: "module_current", visibility: [":__pkg__"], diff --git a/StubLibraries.bp b/StubLibraries.bp index c0197c4b2acfb..ef4e202fdfe25 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -329,13 +329,13 @@ java_library_static { srcs: [ ":api-stubs-docs-non-updatable" ], static_libs: [ "conscrypt.module.public.api.stubs", - "framework-media-stubs-publicapi", - "framework-mediaprovider-stubs-publicapi", - "framework-permission-stubs-publicapi", - "framework-sdkextensions-stubs-publicapi", - "framework-statsd-stubs-publicapi", - "framework-tethering-stubs-publicapi", - "framework-wifi-stubs-publicapi", + "framework-media.stubs", + "framework-mediaprovider.stubs", + "framework-permission.stubs", + "framework-sdkextensions.stubs", + "framework-statsd.stubs", + "framework-tethering.stubs", + "framework-wifi.stubs", "private-stub-annotations-jar", ], defaults: ["android_defaults_stubs_current"], @@ -359,13 +359,13 @@ java_library_static { srcs: [ ":system-api-stubs-docs-non-updatable" ], static_libs: [ "conscrypt.module.public.api.stubs", - "framework-media-stubs-systemapi", - "framework-mediaprovider-stubs-systemapi", - "framework-permission-stubs-systemapi", - "framework-sdkextensions-stubs-systemapi", - "framework-statsd-stubs-systemapi", - "framework-tethering-stubs-systemapi", - "framework-wifi-stubs-systemapi", + "framework-media.stubs.system", + "framework-mediaprovider.stubs.system", + "framework-permission.stubs.system", + "framework-sdkextensions.stubs.system", + "framework-statsd.stubs.system", + "framework-tethering.stubs.system", + "framework-wifi.stubs.system", "private-stub-annotations-jar", ], defaults: ["android_defaults_stubs_current"], diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp index ac501a510e80e..4417b681efc37 100644 --- a/apex/media/framework/Android.bp +++ b/apex/media/framework/Android.bp @@ -96,11 +96,6 @@ java_sdk_library { ":updatable-media-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", - libs: [ "framework_media_annotation", ], diff --git a/apex/permission/framework/Android.bp b/apex/permission/framework/Android.bp index 732caecbd4a77..be553feb1d34b 100644 --- a/apex/permission/framework/Android.bp +++ b/apex/permission/framework/Android.bp @@ -38,11 +38,6 @@ java_sdk_library { ":framework-permission-sources", ], - // 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", - apex_available: [ "com.android.permission", "test_com.android.permission", diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp index 78496c4074f84..1f479963eaa94 100644 --- a/apex/statsd/framework/Android.bp +++ b/apex/statsd/framework/Android.bp @@ -51,11 +51,6 @@ java_sdk_library { defaults: ["framework-module-defaults"], installable: true, - // 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", - srcs: [ ":framework-statsd-sources", ], diff --git a/packages/Tethering/Android.bp b/packages/Tethering/Android.bp index 8ae30a5c6f92a..d07a70c1af9b7 100644 --- a/packages/Tethering/Android.bp +++ b/packages/Tethering/Android.bp @@ -34,7 +34,7 @@ java_defaults { ], libs: [ "framework-tethering.impl", - "framework-wifi-stubs-systemapi", + "framework-wifi", "unsupportedappusage", ], plugins: ["java_api_finder"], diff --git a/packages/Tethering/common/TetheringLib/Android.bp b/packages/Tethering/common/TetheringLib/Android.bp index 6c05b11258f07..c8becce7be824 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/packages/Tethering/tests/unit/Android.bp b/packages/Tethering/tests/unit/Android.bp index fccc6902e3654..45c7b656e28fa 100644 --- a/packages/Tethering/tests/unit/Android.bp +++ b/packages/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 diff --git a/services/Android.bp b/services/Android.bp index 882085a7d0ba6..00676e3326565 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -87,7 +87,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 a95a0c2eaf282..9e8a8727dc362 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -99,7 +99,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", "service-permission-stubs", ], diff --git a/wifi/Android.bp b/wifi/Android.bp index 0df578f2216b9..83b35616286a8 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -111,11 +111,6 @@ java_sdk_library { ":framework-wifi-util-lib-aidls", ], - // 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: ":wifi-jarjar-rules", installable: true,