Merge "Tweak the defaults of module stubs" am: b5997d270d am: 99703f7876 am: 4b25e18122 (7fd7c93a) · Commits · e / os / android_frameworks_base

apex/Android.bp

+19 −22

Original line number	Diff line number	Diff line
		@@ -29,6 +29,16 @@ mainline_stubs_args =
		// TODO: remove this server classes are cleaned up.
		mainline_stubs_args += "--hide-package com.android.server "

		priv_apps = " " +
		"--show-annotation android.annotation.SystemApi\\(" +
		"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +
		"\\) "

		module_libs = " " +
		" --show-annotation android.annotation.SystemApi\\(" +
		"client=android.annotation.SystemApi.Client.MODULE_LIBRARIES," +
		"\\) "

		stubs_defaults {
		name: "framework-module-stubs-defaults-publicapi",
		args: mainline_stubs_args,
		@@ -37,36 +47,23 @@ stubs_defaults {

		stubs_defaults {
		name: "framework-module-stubs-defaults-systemapi",
		args: mainline_stubs_args +
		" --show-annotation android.annotation.SystemApi\\(" +
		"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +
		"process=android.annotation.SystemApi.Process.ALL\\) ",
		args: mainline_stubs_args + priv_apps,
		installable: false,
		}

		// The defaults for module_libs comes in two parts - defaults for API checks
		// and defaults for stub generation. This is because we want the API txt
		// files to only include the module_libs_api, but the stubs to include
		// module_libs_api as well as priv_apps.

		stubs_defaults {
		name: "framework-module-stubs-defaults-module_apps_api",
		args: mainline_stubs_args +
		" --show-annotation android.annotation.SystemApi\\(" +
		"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +
		"process=android.annotation.SystemApi.Process.ALL\\) " +
		" --show-annotation android.annotation.SystemApi\\(" +
		"client=android.annotation.SystemApi.Client.MODULE_APPS," +
		"process=android.annotation.SystemApi.Process.ALL\\) ",
		name: "framework-module-api-defaults-module_libs_api",
		args: mainline_stubs_args + module_libs,
		installable: false,
		}

		stubs_defaults {
		name: "framework-module-stubs-defaults-module_libs_api",
		args: mainline_stubs_args +
		" --show-annotation android.annotation.SystemApi\\(" +
		"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +
		"process=android.annotation.SystemApi.Process.ALL\\) " +
		" --show-annotation android.annotation.SystemApi\\(" +
		"client=android.annotation.SystemApi.Client.MODULE_APPS," +
		"process=android.annotation.SystemApi.Process.ALL\\) " +
		" --show-annotation android.annotation.SystemApi\\(" +
		"client=android.annotation.SystemApi.Client.MODULE_LIBRARIES," +
		"process=android.annotation.SystemApi.Process.ALL\\) ",
		args: mainline_stubs_args + module_libs + priv_apps,
		installable: false,
		}