commit d3ed048103fcc5a05a91d211043decccb39b0722
author Dan Willemsen <dwillemsen@google.com> Mon May 23 21:35:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 23 21:35:10 2016 +0000
tree ad0d3770af832ce30670ff112cbd108dcf7bb8cb
parent 40f23fc5aca74025591403b8a4a25a618b77bc4b
parent 5f5c4bccd9605534aca1e23da68a52b59390437d

Merge "Add LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: c11ae6c569 am: 8b0af507d9
am: 5f5c4bccd9

* commit '5f5c4bccd9605534aca1e23da68a52b59390437d':
  Add LOCAL_CTS_GTEST_LIST_EXECUTABLE

Change-Id: I2d90ac0a48d10f6a6a344a040cc9327df838c4ed

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index da882f3..78f860f 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -364,6 +364,7 @@
 LOCAL_INIT_RC_32:=
 LOCAL_INIT_RC_64:=
 LOCAL_JAVA_LANGUAGE_VERSION:=
+LOCAL_CTS_GTEST_LIST_EXECUTABLE:=
 
 # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
 # iterate over thousands of entries every time.