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

Re-submit "Create all variants of stubs for wifi"

Browse Source 
Use sdk_version: module_current instead.

This reverts commit d20f03011f.

Test: m
Test: build/soong/soong_ui.bash --make-mode dist ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Change-Id: I36cf007a4813027721dfb6389e10cf95085f85e4
This commit is contained in:
Anton Hansson
2020-02-05 09:49:35 +00:00
parent 358a2d2c99
commit 21f0ed2a0a
3 changed files with 59 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.bp
View File

@@ -473,7 +473,7 @@ java_library {
"framework-sdkextensions-stubs-systemapi", "framework-sdkextensions-stubs-systemapi",
"framework-statsd-stubs-module_libs_api", "framework-statsd-stubs-module_libs_api",
"framework-permission-stubs-systemapi", "framework-permission-stubs-systemapi",
"framework-wifi-stubs", "framework-wifi-stubs-systemapi",
"framework-tethering-stubs", "framework-tethering-stubs",
], ],
installable: true, installable: true,
@@ -523,7 +523,7 @@ java_library {
"framework-permission-stubs-systemapi", "framework-permission-stubs-systemapi",
"framework-sdkextensions-stubs-systemapi", "framework-sdkextensions-stubs-systemapi",
"framework-statsd-stubs-module_libs_api", "framework-statsd-stubs-module_libs_api",
"framework-wifi-stubs", "framework-wifi-stubs-systemapi",
"framework-tethering-stubs", "framework-tethering-stubs",
// TODO (b/147688669) should be framework-telephony-stubs // TODO (b/147688669) should be framework-telephony-stubs
"framework-telephony", "framework-telephony",

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

@@ -41,7 +41,7 @@ android_test {
"framework-minus-apex", "framework-minus-apex",
"ext", "ext",
"framework-res", "framework-res",
"framework-wifi-stubs", "framework-wifi-stubs-module_libs_api",
"framework-telephony-stubs", "framework-telephony-stubs",
"android.test.runner", "android.test.runner",
"android.test.base", "android.test.base",

71
wifi/Android.bp
View File

@@ -132,27 +132,68 @@ java_library {
], ],
} }
droidstubs { stubs_defaults {
name: "framework-wifi-stubs-srcs", name: "framework-wifi-stubs-srcs-defaults",
srcs: [ srcs: [
":framework-annotations",
":framework-wifi-updatable-sources", ":framework-wifi-updatable-sources",
":framework-wifi-util-lib-aidls",
],
libs: [ "framework-annotations-lib" ],
sdk_version: "module_current",
}
droidstubs {
name: "framework-wifi-stubs-srcs-publicapi",
defaults: [
"framework-module-stubs-defaults-publicapi",
"framework-wifi-stubs-srcs-defaults",
],
}
droidstubs {
name: "framework-wifi-stubs-srcs-systemapi",
defaults: [
"framework-module-stubs-defaults-systemapi",
"framework-wifi-stubs-srcs-defaults",
],
}
droidstubs {
name: "framework-wifi-api-module_libs_api",
defaults: [
"framework-module-api-defaults-module_libs_api",
"framework-wifi-stubs-srcs-defaults",
],
}
droidstubs {
name: "framework-wifi-stubs-srcs-module_libs_api",
defaults: [
"framework-module-stubs-defaults-module_libs_api",
"framework-wifi-stubs-srcs-defaults",
], ],
// This is needed as IOnWifiActivityEnergyInfoListener.aidl in framework-wifi depends on
// WifiActivityEnergyInfo.aidl in framework-minus-apex
aidl: {
include_dirs: ["frameworks/base/core/java"],
},
defaults: [ "framework-module-stubs-defaults-systemapi" ],
sdk_version: "core_current",
libs: ["android_system_stubs_current"],
} }
java_library { java_library {
name: "framework-wifi-stubs", name: "framework-wifi-stubs-publicapi",
srcs: [":framework-wifi-stubs-srcs"], srcs: [":framework-wifi-stubs-srcs-publicapi"],
sdk_version: "core_current", sdk_version: "module_current",
libs: ["android_system_stubs_current"], installable: false,
}
java_library {
name: "framework-wifi-stubs-systemapi",
srcs: [":framework-wifi-stubs-srcs-systemapi"],
sdk_version: "module_current",
libs: ["framework-annotations-lib"],
installable: false,
}
java_library {
name: "framework-wifi-stubs-module_libs_api",
srcs: [":framework-wifi-stubs-srcs-module_libs_api"],
sdk_version: "module_current",
libs: ["framework-annotations-lib"],
installable: false, installable: false,
} }