Merge "Revert "Create all variants of stubs for wifi"" (15e001d2) · Commits · e / os / android_frameworks_base

Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -470,7 +470,7 @@ java_library {
		"framework-sdkextensions-stubs-systemapi",
		"framework-statsd", // TODO(b/146167933): Use framework-statsd-stubs
		"framework-permission-stubs-systemapi",
		"framework-wifi-stubs-systemapi",
		"framework-wifi-stubs",
		"ike-stubs",
		],
		installable: true,
		@@ -521,7 +521,7 @@ java_library {
		"framework-sdkextensions-stubs-systemapi",
		// TODO(b/146167933): Use framework-statsd-stubs instead.
		"framework-statsd",
		"framework-wifi-stubs-systemapi",
		"framework-wifi-stubs",
		"ike-stubs",
		// TODO(b/147200698): should be the stub of framework-tethering
		"framework-tethering",

wifi/Android.bp

+13 −56

Original line number	Diff line number	Diff line
		@@ -132,70 +132,27 @@ java_library {
		],
		}

		stubs_defaults {
		name: "framework-wifi-stubs-srcs-defaults",
		droidstubs {
		name: "framework-wifi-stubs-srcs",
		srcs: [
		":framework-annotations",
		":framework-wifi-updatable-sources",
		],
		// This is needed as IOnWifiActivityEnergyInfoListener.aidl in framework-wifi depends on
		// WifiActivityEnergyInfo.aidl in framework-minus-apex
		aidl: {
		include_dirs: ["frameworks/base/core/java"],
		},
		srcs: [ ":framework-wifi-updatable-sources" ],
		libs: [ "framework-annotations-lib" ],
		sdk_version: "system_current",
		}

		droidstubs {
		name: "framework-wifi-stubs-srcs-publicapi",
		defaults: [
		"framework-module-stubs-defaults-publicapi",
		"framework-wifi-stubs-srcs-defaults",
		],
		}

		droidstubs {
		name: "framework-wifi-stubs-srcs-systemapi",
		defaults: [
		"framework-module-stubs-defaults-systemapi",
		"framework-wifi-stubs-srcs-defaults",
		],
		}

		droidstubs {
		name: "framework-wifi-api-module_libs_api",
		defaults: [
		"framework-module-api-defaults-module_libs_api",
		"framework-wifi-stubs-srcs-defaults",
		],
		}

		droidstubs {
		name: "framework-wifi-stubs-srcs-module_libs_api",
		defaults: [
		"framework-module-stubs-defaults-module_libs_api",
		"framework-wifi-stubs-srcs-defaults",
		],
		}

		java_library {
		name: "framework-wifi-stubs-publicapi",
		srcs: [":framework-wifi-stubs-srcs-publicapi"],
		sdk_version: "current",
		installable: false,
		}

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

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