commit 62c220b20b3fc431c27feac29a71d040fc8e2626
author Joe Onorato <joeo@google.com> Sat Nov 18 20:32:56 2017 -0800
committer Joe Onorato <joeo@google.com> Wed Dec 13 18:26:45 2017 -0800
tree 4915764f6640ca69fcd2ecbc1dde9f1d40768dc0
parent 37e9278c7799719180549384d7390079a10e46ea

Fix how we build the statsd protos.

This lets us include frameworks protos, and use the constants
and messages from them.

Change-Id: I609d6e524f780e6a5beea543a68561bede47813e
Test: make

Android.mk

diff --git a/Android.mk b/Android.mk
index ec5fb84..8cdd87e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1008,7 +1008,7 @@
 # ====  java proto device library (for test only)  ==============================
 include $(CLEAR_VARS)
 LOCAL_MODULE := platformprotosnano
-LOCAL_MODULE_TAGS := tests optional
+LOCAL_MODULE_TAGS := tests
 LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_PROTOC_FLAGS := \
     -Iexternal/protobuf/src
@@ -1020,6 +1020,17 @@
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 
+# ====  java proto device library (for test only)  ==============================
+include $(CLEAR_VARS)
+LOCAL_MODULE := platformprotoslite
+LOCAL_MODULE_TAGS := tests
+LOCAL_PROTOC_OPTIMIZE_TYPE := lite
+LOCAL_PROTOC_FLAGS := \
+    -Iexternal/protobuf/src
+LOCAL_SRC_FILES := \
+    $(call all-proto-files-under, core/proto)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
 # Include subdirectory makefiles
 # ============================================================