diff options
| author | Gopinath Elanchezhian <gelanchezhian@google.com> | 2018-09-08 04:12:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-08 04:12:16 +0000 |
| commit | 73e0854f724bfd0b005e5b0cb399e65de535b72b (patch) | |
| tree | ae36bf0a68ddc1070c1681978488b753bc19846a | |
| parent | 8a903bdb33bd15b6ce8ccccfd66496db93a7a23a (diff) | |
| parent | a9864fdcd3bddfce256b8bbf3886054fdee2f150 (diff) | |
Merge "Add statsdprotolite in Android.bp"
| -rw-r--r-- | cmds/statsd/Android.bp | 22 | ||||
| -rw-r--r-- | cmds/statsd/Android.mk | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index b5660995fa36..3fae586725ec 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -43,3 +43,25 @@ cc_library_host_shared { } +// ==== java proto device library (for test only) ============================== +java_library { + name: "statsdprotolite", + proto: { + type: "lite", + include_dirs: ["external/protobuf/src"], + }, + + srcs: [ + "src/stats_log.proto", + "src/statsd_config.proto", + "src/atoms.proto", + ], + + static_libs: [ + "platformprotoslite", + ], + // Protos have lots of MissingOverride and similar. + errorprone: { + javacflags: ["-XepDisableAllChecks"], + }, +} diff --git a/cmds/statsd/Android.mk b/cmds/statsd/Android.mk index ba2aaad875d0..5e87ef658dd5 100644 --- a/cmds/statsd/Android.mk +++ b/cmds/statsd/Android.mk @@ -243,28 +243,6 @@ LOCAL_SHARED_LIBRARIES := $(statsd_common_shared_libraries) \ include $(BUILD_NATIVE_TEST) ############################## -# stats proto static java lib -############################## - -include $(CLEAR_VARS) -LOCAL_MODULE := statsdprotolite - -LOCAL_SRC_FILES := \ - src/stats_log.proto \ - src/statsd_config.proto \ - src/atoms.proto - -LOCAL_PROTOC_OPTIMIZE_TYPE := lite - -LOCAL_STATIC_JAVA_LIBRARIES := \ - platformprotoslite - -LOCAL_PROTOC_FLAGS := \ - -Iexternal/protobuf/src - -include $(BUILD_STATIC_JAVA_LIBRARY) - -############################## # statsd micro benchmark ############################## |