From 7ece04238efbcc019fb81e4221eb1b296c79542b Mon Sep 17 00:00:00 2001
From: Steven Timotius <stimo@google.com>
Date: Thu, 3 Aug 2017 13:37:26 -0700
Subject: [PATCH] Convert Activity and WindowManager Tests to Device Side

The proto-full library used the the existing hostsidetests
is not available to device side test APKs.
This new module uses proto-nano which is available to
device side test APKs.

Bug: 64807080
Test: cts-tradefed run commandAndExit cts-dev --module CtsWindowManagerDeviceTestCases
Test: cts-tradefed run commandAndExit cts-dev --module CtsServicesDeviceTestCases

Change-Id: I85c63b545d07a053aa7e5fa551681d0e170786eb
---
 Android.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Android.mk b/Android.mk
index 46fa0d6cc0f53..2ba31dfda9e2a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1582,6 +1582,20 @@ LOCAL_SRC_FILES := \
     $(call all-proto-files-under, libs/incident/proto)
 include $(BUILD_HOST_JAVA_LIBRARY)
 
+# ====  java proto device library (for test only)  ==============================
+include $(CLEAR_VARS)
+LOCAL_MODULE := platformprotosnano
+LOCAL_MODULE_TAGS := tests optional
+LOCAL_PROTOC_OPTIMIZE_TYPE := nano
+LOCAL_PROTOC_FLAGS := \
+    -Iexternal/protobuf/src
+LOCAL_PROTO_JAVA_OUTPUT_PARAMS := \
+    store_unknown_fields = true
+LOCAL_JAVA_LIBRARIES := core-oj core-libart
+LOCAL_SRC_FILES := \
+    $(call all-proto-files-under, core/proto)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
 
 # Include subdirectory makefiles
 # ============================================================