From bb426739ce31220cb7029fec320f181c7bd4f57d Mon Sep 17 00:00:00 2001
From: James Lemieux <jplemieux@google.com>
Date: Sun, 28 Jan 2018 02:40:51 -0800
Subject: [PATCH] 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 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 7d3fa75d8..0f700daf6 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -435,6 +435,13 @@ LOCAL_STATIC_LIBRARIES_64:=
 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 :=