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

Merge "Switch to standard naming scheme" into rvc-dev

Browse Source
This commit is contained in:
Paul Duffin
2020-06-02 11:41:52 +00:00
committed by Android (Google) Code Review
parent cbea0ab58f abebc6a897
commit f94d682a9b
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

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

28
StubLibraries.bp
View File

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

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

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

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

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

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

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

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

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

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,