Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to standard naming scheme

Browse Source 
Removes use of the special framework-modules naming scheme.

Bug: 155164730
Test: m java
Exempt-From-Owner-Approval: Build cleanup.
Change-Id: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
This commit is contained in:
Paul Duffin
2020-05-31 11:35:50 +01:00
parent 1081372ac7
commit 8b864fb45c
11 changed files with 25 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Android.bp
View File

@@ -373,13 +373,13 @@ java_library {
static_libs: [
"framework-appsearch-stubs", // TODO: Update to module_libs_api when there is one.
"framework-graphics-stubs-module_libs_api",
"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__"],

28
StubLibraries.bp
View File

@@ -338,13 +338,13 @@ java_library_static {
static_libs: [
"conscrypt.module.public.api.stubs",
"framework-graphics-stubs-publicapi",
"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"],
@@ -370,13 +370,13 @@ java_library_static {
"conscrypt.module.public.api.stubs",
"framework-appsearch-stubs", // TODO: standardize appsearch stubs
"framework-graphics-stubs-systemapi",
"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"],

5
apex/media/framework/Android.bp
View File

@@ -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",
],

5
apex/permission/framework/Android.bp
View File

@@ -28,11 +28,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",

5
apex/statsd/framework/Android.bp
View File

@@ -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",
],

2
packages/Tethering/Android.bp
View File

@@ -35,7 +35,7 @@ java_defaults {
libs: [
"framework-tethering.impl",
"framework-telephony-stubs",
"framework-wifi-stubs-systemapi",
"framework-wifi",
"unsupportedappusage",
],
plugins: ["java_api_finder"],

5
packages/Tethering/common/TetheringLib/Android.bp
View File

@@ -20,11 +20,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,

2
packages/Tethering/tests/unit/Android.bp
View File

@@ -61,7 +61,7 @@ java_defaults {
"framework-res",
"framework-telephony-stubs",
"framework-tethering.impl",
"framework-wifi-stubs-module_libs_api",
"framework-wifi.stubs.module_lib",
],
jni_libs: [
// For mockito extended

2
services/Android.bp
View File

@@ -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)

2
services/core/Android.bp
View File

@@ -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",
],

5
wifi/Android.bp
View File

@@ -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,