Merge "Limit framework module api packages" into rvc-dev am: 26c1b004da
Change-Id: Ia26fa1f7271f6422f67b5ccdd84f46d1bd9340c6
diff --git a/Android.bp b/Android.bp
index 8931ec01..e7d8d99 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1275,7 +1275,22 @@
removed_api_file: "telephony/api/system-removed.txt",
},
},
- defaults: ["framework-module-stubs-defaults-systemapi"],
+ // TODO: make telephony inherit the shared stubs and remove this
+ args: "--show-annotation android.annotation.SystemApi\\(" +
+ "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
+ "\\) " +
+ "--error UnhiddenSystemApi " +
+ "--hide BroadcastBehavior " +
+ "--hide DeprecationMismatch " +
+ "--hide HiddenSuperclass " +
+ "--hide HiddenTypedefConstant " +
+ "--hide HiddenTypeParameter " +
+ "--hide MissingPermission " +
+ "--hide RequiresPermission " +
+ "--hide SdkConstant " +
+ "--hide Todo " +
+ "--hide Typo " +
+ "--hide UnavailableSymbol ",
filter_packages: ["android.telephony"],
sdk_version: "system_current",
}
diff --git a/apex/Android.bp b/apex/Android.bp
index d0889ef..5f418d4 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -26,6 +26,20 @@
"--hide Typo " +
"--hide UnavailableSymbol "
+// TODO: modularize this so not every module has the same whitelist
+framework_packages_to_document = [
+ "android",
+ "dalvik",
+ "java",
+ "javax",
+ "junit",
+ "org.apache.http",
+ "org.json",
+ "org.w3c.dom",
+ "org.xml.sax",
+ "org.xmlpull",
+]
+
// TODO: remove the hiding when server classes are cleaned up.
mainline_framework_stubs_args =
mainline_stubs_args +
@@ -54,6 +68,7 @@
args: mainline_framework_stubs_args,
installable: false,
sdk_version: "current",
+ filter_packages: framework_packages_to_document,
check_api: {
current: {
api_file: "api/current.txt",
@@ -72,6 +87,7 @@
libs: ["framework-annotations-lib"],
installable: false,
sdk_version: "system_current",
+ filter_packages: framework_packages_to_document,
check_api: {
current: {
api_file: "api/system-current.txt",
@@ -125,6 +141,7 @@
libs: ["framework-annotations-lib"],
installable: false,
sdk_version: "module_current",
+ filter_packages: framework_packages_to_document,
check_api: {
current: {
api_file: "api/module-lib-current.txt",
@@ -143,6 +160,7 @@
libs: ["framework-annotations-lib"],
installable: false,
sdk_version: "module_current",
+ filter_packages: framework_packages_to_document,
}
stubs_defaults {