Merge "Compile service-statsd against the system server SDK" into rvc-dev am: 97773cbe29

Change-Id: I6ac25ceabff91ad1db0b2937d50e2c565876623d
This commit is contained in:
Anton Hansson
2020-03-20 10:35:51 +00:00
committed by Automerger Merge Worker

View File

@@ -21,28 +21,13 @@ filegroup {
java_library { java_library {
name: "service-statsd", name: "service-statsd",
installable: true, srcs: [ ":service-statsd-sources" ],
sdk_version: "system_server_current",
srcs: [
":service-statsd-sources",
],
// TODO(b/146757305) should be "module_current" since not allowed to use
// @CorePlatformApi's
sdk_version: "core_platform",
libs: [ libs: [
"framework-annotations-lib", "framework-annotations-lib",
"services-stubs",
"framework-statsd", "framework-statsd",
// TODO(b/146757305): should be unnecessary once
// sdk_version="module_lib_current" or "module_current"
"android_module_lib_stubs_current",
], ],
plugins: ["java_api_finder"], plugins: ["java_api_finder"],
apex_available: [ apex_available: [
"com.android.os.statsd", "com.android.os.statsd",
"test_com.android.os.statsd", "test_com.android.os.statsd",