commit 343068e607e144484267450138f141bd969e17c9
author Roland Levillain <rpl@google.com> Sat Jan 12 20:43:15 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 12 20:43:15 2019 +0000
tree 090a66e95a112d2608570d572234e2883de9f045
parent 02a8e19e3d6ad2f675b67173696950957d68360f
parent 7c777f8fe8311dfd88d87da0c89d351a7f3e5af2

Merge "Honor `ART_TEST_ANDROID_RUNTIME_ROOT` when running ART gtests on target."

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 00055b2..f00da9c 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -425,6 +425,9 @@
 endif
 
 ART_GTEST_TARGET_ANDROID_RUNTIME_ROOT := '/apex/com.android.runtime'
+ifneq ($(ART_TEST_ANDROID_RUNTIME_ROOT),)
+  ART_GTEST_TARGET_ANDROID_RUNTIME_ROOT := $(ART_TEST_ANDROID_RUNTIME_ROOT)
+endif
 
 # Define a make rule for a target device gtest.
 # $(1): gtest name - the name of the test we're building such as leb128_test.