Re-submit "Create all variants of stubs for wifi"
Use sdk_version: module_current instead.
This reverts commit d20f03011f95bd04bace0977d246cdc737ce5627.
Bug: 147768409
Test: m
Test: build/soong/soong_ui.bash --make-mode dist ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Exempt-From-Owner-Approval: clean cp
Change-Id: I36cf007a4813027721dfb6389e10cf95085f85e4
Merged-In: I36cf007a4813027721dfb6389e10cf95085f85e4
(cherry picked from commit 21f0ed2a0aceddd4ce3dfcf792cb1ae9a144547b)
diff --git a/Android.bp b/Android.bp
index 82e1a86..2ad8f81 100644
--- a/Android.bp
+++ b/Android.bp
@@ -472,7 +472,7 @@
"framework-sdkextensions-stubs-systemapi",
"framework-statsd-stubs-module_libs_api",
"framework-permission-stubs-systemapi",
- "framework-wifi-stubs",
+ "framework-wifi-stubs-systemapi",
"framework-tethering-stubs",
],
installable: true,
@@ -522,7 +522,7 @@
"framework-permission-stubs-systemapi",
"framework-sdkextensions-stubs-systemapi",
"framework-statsd-stubs-module_libs_api",
- "framework-wifi-stubs",
+ "framework-wifi-stubs-systemapi",
"framework-tethering-stubs",
// TODO (b/147688669) should be framework-telephony-stubs
"framework-telephony",
diff --git a/packages/Tethering/tests/unit/Android.bp b/packages/Tethering/tests/unit/Android.bp
index c6905ec..59681e9 100644
--- a/packages/Tethering/tests/unit/Android.bp
+++ b/packages/Tethering/tests/unit/Android.bp
@@ -41,7 +41,7 @@
"framework-minus-apex",
"ext",
"framework-res",
- "framework-wifi-stubs",
+ "framework-wifi-stubs-module_libs_api",
"framework-telephony-stubs",
"android.test.runner",
"android.test.base",
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 0c6cf1c..e253d6d 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -132,27 +132,68 @@
],
}
-droidstubs {
- name: "framework-wifi-stubs-srcs",
+stubs_defaults {
+ name: "framework-wifi-stubs-srcs-defaults",
srcs: [
- ":framework-annotations",
":framework-wifi-updatable-sources",
+ ":framework-wifi-util-lib-aidls",
],
- // 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"],
+ 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",
+ ],
}
java_library {
- name: "framework-wifi-stubs",
- srcs: [":framework-wifi-stubs-srcs"],
- sdk_version: "core_current",
- libs: ["android_system_stubs_current"],
+ name: "framework-wifi-stubs-publicapi",
+ srcs: [":framework-wifi-stubs-srcs-publicapi"],
+ sdk_version: "module_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,
}