Merge "Merge "Limit framework module api packages" into rvc-dev am: 26c1b004da... (23e5e727) · Commits · e / os / android_frameworks_base

Android.bp

+16 −1

Original line number	Diff line number	Diff line
		@@ -1281,7 +1281,22 @@ droidstubs {
		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",
		}

+18 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,20 @@ mainline_stubs_args =
		"--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 @@ stubs_defaults {
		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 @@ stubs_defaults {
		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 @@ stubs_defaults {
		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 @@ stubs_defaults {
		libs: ["framework-annotations-lib"],
		installable: false,
		sdk_version: "module_current",
		filter_packages: framework_packages_to_document,
		}

		stubs_defaults {