Merge "Build statsd framework jar against module_current"
diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index ab669d4..5533ed8 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -48,17 +48,8 @@
java_defaults {
name: "framework-statsd-defaults",
-
- // TODO(b/146757305): Use "module_current" once it's ready.
- sdk_version: "core_current",
-
- libs: [
- "framework-annotations-lib",
-
- // TODO(b/146757305): should be unnecessary once
- // sdk_version="module_lib_current" or "module_current"
- "android_module_lib_stubs_current",
- ],
+ sdk_version: "module_current",
+ libs: [ "framework-annotations-lib" ],
}
java_library {
@@ -72,16 +63,6 @@
":framework-statsd-sources",
],
- aidl: {
- // TODO(b/146757305): should be unnecessary once
- // sdk_version="module_lib_current" or "module_current"
- include_dirs: [
- // To refer:
- // android.app.PendintIntent
- "frameworks/base/core/java",
- ],
- },
-
permitted_packages: [
"android.app",
"android.os",