Merge "Put sdk_version in module stub defaults" into rvc-dev (261e944b) · Commits · e / os / android_frameworks_base

apex/Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ stubs_defaults {
		name: "framework-module-stubs-defaults-publicapi",
		args: mainline_stubs_args,
		installable: false,
		sdk_version: "current",
		}

		stubs_defaults {
		@@ -50,6 +51,7 @@ stubs_defaults {
		args: mainline_stubs_args + priv_apps,
		srcs: [":framework-annotations"],
		installable: false,
		sdk_version: "system_current",
		}

		// The defaults for module_libs comes in two parts - defaults for API checks
		@@ -62,6 +64,7 @@ stubs_defaults {
		args: mainline_stubs_args + module_libs,
		srcs: [":framework-annotations"],
		installable: false,
		sdk_version: "module_current",
		}

		stubs_defaults {
		@@ -69,4 +72,5 @@ stubs_defaults {
		args: mainline_stubs_args + module_libs + priv_apps,
		srcs: [":framework-annotations"],
		installable: false,
		sdk_version: "module_current",
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -177,14 +177,14 @@ droidstubs {
		java_library {
		name: "framework-wifi-stubs-publicapi",
		srcs: [":framework-wifi-stubs-srcs-publicapi"],
		sdk_version: "module_current",
		sdk_version: "current",
		installable: false,
		}

		java_library {
		name: "framework-wifi-stubs-systemapi",
		srcs: [":framework-wifi-stubs-srcs-systemapi"],
		sdk_version: "module_current",
		sdk_version: "system_current",
		libs: ["framework-annotations-lib"],
		installable: false,
		}