commit bb426739ce31220cb7029fec320f181c7bd4f57d
author James Lemieux <jplemieux@google.com> Sun Jan 28 02:40:51 2018 -0800
committer Hall Liu <hallliu@google.com> Mon Feb 05 15:39:18 2018 -0800
tree d89f059146b706ccea2effadd7889f56c4b5d1bd
parent 157fbf771b4f9a1ae420c2d9dccb05a7bd885472

Clear local robolectric testing variables

This prevents them from mistakenly bleeding between test targets.

Bug: 72384841
Test: make Run_TeleService_robotests
Change-Id: Ie2c047be1450420f8e27b8b45e9416e96b477b45

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 7d3fa75..0f700da 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -435,6 +435,13 @@
 LOCAL_WHOLE_STATIC_LIBRARIES_32:=
 LOCAL_WHOLE_STATIC_LIBRARIES_64:=
 
+# Robolectric variables
+LOCAL_INSTRUMENT_SOURCE_DIRS :=
+LOCAL_ROBOTEST_FAILURE_FATAL :=
+LOCAL_ROBOTEST_FILES :=
+LOCAL_ROBOTEST_TIMEOUT :=
+LOCAL_TEST_PACKAGE :=
+
 # Aux specific variables
 LOCAL_AUX_ARCH :=
 LOCAL_AUX_CPU :=