diff options
| -rw-r--r-- | apex/statsd/aidl/Android.bp | 2 | ||||
| -rw-r--r-- | apex/statsd/framework/Android.bp | 73 | ||||
| -rw-r--r-- | apex/statsd/service/Android.bp | 15 |
3 files changed, 59 insertions, 31 deletions
diff --git a/apex/statsd/aidl/Android.bp b/apex/statsd/aidl/Android.bp index db5f439cd40e..7c93bc73e45d 100644 --- a/apex/statsd/aidl/Android.bp +++ b/apex/statsd/aidl/Android.bp @@ -14,7 +14,7 @@ // limitations under the License. // filegroup { - name: "statsd_java_aidl", + name: "framework-statsd-aidl-sources", srcs: ["**/*.aidl"], } diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp index 80def475efb9..63a853a6005c 100644 --- a/apex/statsd/framework/Android.bp +++ b/apex/statsd/framework/Android.bp @@ -31,35 +31,56 @@ filegroup { name: "framework-statsd-sources", srcs: [ "java/**/*.java", - ":statsd_java_aidl", + ":framework-statsd-aidl-sources", ":statslog-statsd-java-gen", ], } +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", + ], +} + java_library { name: "framework-statsd", + defaults: [ + "framework-statsd-defaults", + ], installable: true, - // TODO(b/146209659): Use system_current instead. - sdk_version: "core_platform", + srcs: [ ":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", "android.util", ], - libs: [ - "framework-annotations-lib", - // TODO(b/146230220): Use android_module_lib_stubs_current instead. - //"android_module_lib_stubs_current", - "framework-all", - ], + hostdex: true, // for hiddenapi check visibility: [ "//frameworks/base/apex/statsd:__subpackages__", - //TODO(b/146167933) remove this - "//frameworks/opt/net/wifi/service", ], apex_available: [ "com.android.os.statsd", @@ -69,13 +90,14 @@ java_library { stubs_defaults { name: "framework-statsd-stubs-srcs-defaults", - srcs: [ ":framework-statsd-sources" ], + srcs: [ + ":framework-statsd-sources", + ], + libs: [ - // TODO(b/148218250): Change to android_system_stubs_current - "framework-all", "framework-annotations-lib", ], - sdk_version: "core_platform", + sdk_version: "system_current", } droidstubs { @@ -92,6 +114,7 @@ droidstubs { "framework-module-stubs-defaults-systemapi", "framework-statsd-stubs-srcs-defaults", ], + } droidstubs { @@ -112,24 +135,24 @@ droidstubs { java_library { name: "framework-statsd-stubs-publicapi", + defaults: [ + "framework-statsd-defaults", + ], srcs: [ ":framework-statsd-stubs-srcs-publicapi" ], - // TODO(b/148218250): Change to current - libs: [ "framework-all" ], - sdk_version: "core_platform", } java_library { name: "framework-statsd-stubs-systemapi", + defaults: [ + "framework-statsd-defaults", + ], srcs: [ ":framework-statsd-stubs-srcs-systemapi" ], - // TODO(b/148218250): Change to system_current - libs: [ "framework-all" ], - sdk_version: "core_platform", } java_library { name: "framework-statsd-stubs-module_libs_api", - srcs: [ ":framework-statsd-stubs-srcs-systemapi" ], - // TODO(b/148218250): Change to system_current - libs: [ "framework-all" ], - sdk_version: "core_platform", + defaults: [ + "framework-statsd-defaults", + ], + srcs: [ ":framework-statsd-stubs-srcs-module_libs_api" ], } diff --git a/apex/statsd/service/Android.bp b/apex/statsd/service/Android.bp index 0f8a151eed7c..0f325e399d0f 100644 --- a/apex/statsd/service/Android.bp +++ b/apex/statsd/service/Android.bp @@ -16,16 +16,21 @@ java_library { srcs: [ ":service-statsd-sources", ], - // TODO(b/146209659): Use system_current instead once framework-statsd compiles against - // system_current. + + // TODO(b/146757305) should be "module_current" since not allowed to use + // @CorePlatformApi's sdk_version: "core_platform", + libs: [ "framework-annotations-lib", - "framework-statsd", - // TODO(b/146758669): Remove this line after nullability annotations are system APIs. - "android_system_stubs_current", "services-stubs", + "framework-statsd", + + // TODO(b/146757305): should be unnecessary once + // sdk_version="module_lib_current" or "module_current" + "android_module_lib_stubs_current", ], + apex_available: [ "com.android.os.statsd", "test_com.android.os.statsd", |