Make wifi module use shared metalava args
Also (hopefully) temporarily filter out com.android.server
from the stubs, as the wifi module has a server class in
it.
Bug: 137191822
Test: m
Change-Id: I2c62fc16c676305e9ee739285f49656075f38b97
diff --git a/apex/Android.bp b/apex/Android.bp
index 85d72c7..56f7db2 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -26,6 +26,9 @@
"--hide Typo " +
"--hide UnavailableSymbol "
+// TODO: remove this server classes are cleaned up.
+mainline_stubs_args += "--hide-package com.android.server "
+
stubs_defaults {
name: "framework-module-stubs-defaults-publicapi",
args: mainline_stubs_args,
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 26064cb..08115ec 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -58,21 +58,6 @@
}
}
-metalava_wifi_docs_args =
- "--hide-package com.android.server " +
- "--error UnhiddenSystemApi " +
- "--hide RequiresPermission " +
- "--hide MissingPermission " +
- "--hide BroadcastBehavior " +
- "--hide HiddenSuperclass " +
- "--hide DeprecationMismatch " +
- "--hide UnavailableSymbol " +
- "--hide SdkConstant " +
- "--hide HiddenTypeParameter " +
- "--hide Todo --hide Typo " +
- "--hide HiddenTypedefConstant " +
- "--show-annotation android.annotation.SystemApi "
-
droidstubs {
name: "framework-wifi-stubs-srcs",
srcs: [
@@ -82,7 +67,7 @@
aidl: {
include_dirs: ["frameworks/base/core/java"],
},
- args: metalava_wifi_docs_args,
+ defaults: [ "framework-module-stubs-defaults-systemapi" ],
sdk_version: "core_current",
libs: ["android_system_stubs_current"],
}