Merge "Make framework-statsd stubs use the new defaults" into rvc-dev am:... (d9d65fbf) · Commits · e / os / android_frameworks_base

apex/statsd/framework/Android.bp

+8 −22

Original line number	Original line	Diff line number	Diff line
	@@ -46,19 +46,11 @@ filegroup {
	"//frameworks/base/apex/statsd:__subpackages__",		"//frameworks/base/apex/statsd:__subpackages__",
	],		],
	}		}

	java_defaults {
	name: "framework-statsd-defaults",
	sdk_version: "module_current",
	libs: [ "framework-annotations-lib" ],
	}

	java_library {		java_library {
	name: "framework-statsd",		name: "framework-statsd",
	defaults: [
	"framework-statsd-defaults",
	],
	installable: true,		installable: true,
			sdk_version: "module_current",
			libs: [ "framework-annotations-lib" ],

	srcs: [		srcs: [
	":framework-statsd-sources",		":framework-statsd-sources",
	@@ -129,39 +121,33 @@ droidstubs {

	java_library {		java_library {
	name: "framework-statsd-stubs-publicapi",		name: "framework-statsd-stubs-publicapi",
	defaults: [		defaults: ["framework-module-stubs-lib-defaults-publicapi"],
	"framework-statsd-defaults",
	],
	srcs: [ ":framework-statsd-stubs-srcs-publicapi" ],		srcs: [ ":framework-statsd-stubs-srcs-publicapi" ],
	visibility: [		visibility: [
	"//frameworks/base", // Framework		"//frameworks/base", // Framework
	"//frameworks/base/apex/statsd", // statsd apex		"//frameworks/base/apex/statsd", // statsd apex
	]		],
	}		}

	java_library {		java_library {
	name: "framework-statsd-stubs-systemapi",		name: "framework-statsd-stubs-systemapi",
	defaults: [		defaults: ["framework-module-stubs-lib-defaults-systemapi"],
	"framework-statsd-defaults",
	],
	srcs: [ ":framework-statsd-stubs-srcs-systemapi" ],		srcs: [ ":framework-statsd-stubs-srcs-systemapi" ],
	visibility: [		visibility: [
	"//frameworks/base", // Framework		"//frameworks/base", // Framework
	"//frameworks/base/apex/statsd", // statsd apex		"//frameworks/base/apex/statsd", // statsd apex
	]		],
	}		}

	java_library {		java_library {
	name: "framework-statsd-stubs-module_libs_api",		name: "framework-statsd-stubs-module_libs_api",
	defaults: [		defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
	"framework-statsd-defaults",
	],
	srcs: [ ":framework-statsd-stubs-srcs-module_libs_api" ],		srcs: [ ":framework-statsd-stubs-srcs-module_libs_api" ],
	visibility: [		visibility: [
	"//frameworks/base", // Framework		"//frameworks/base", // Framework
	"//frameworks/base/apex/statsd", // statsd apex		"//frameworks/base/apex/statsd", // statsd apex
	"//frameworks/opt/net/wifi/service" // wifi service		"//frameworks/opt/net/wifi/service" // wifi service
	]		],
	}		}

	android_test {		android_test {