Merge "Add statsdprotolite in Android.bp" am: f469bd2f68

am: 748b449887

Change-Id: I94293a1cd5ca457224eccaf98ee1c265a3c3ce06

2 files changed, 26 insertions, 23 deletions

diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index b5660995fa36..f1bf10cfa767 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -43,3 +43,29 @@ cc_library_host_shared {
 }
 
 
+// ====  java proto device library (for test only)  ==============================
+java_library {
+    name: "statsdprotolite",
+    no_framework_libs: true,
+    proto: {
+        type: "lite",
+        include_dirs: ["external/protobuf/src"],
+    },
+
+    srcs: [
+        "src/stats_log.proto",
+        "src/statsd_config.proto",
+        "src/perfetto/perfetto_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 091268e15ad4..3dc81fa98673 100644
--- a/cmds/statsd/Android.mk
+++ b/cmds/statsd/Android.mk
@@ -237,29 +237,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/perfetto/perfetto_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
 ##############################