From 26c43778589d1c7598cbe6203b6545c9d3ab220a Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Fri, 23 Nov 2018 17:56:43 +0000
Subject: Add support for ANDROID_RUNTIME_ROOT variable

This commit introduces the ANDROID_RUNTIME_ROOT environment
variable in preparation for its use within the runtime module.

As a module, ART must no longer use the Android-wide
ANDROID_ROOT environment variable as the base of default
paths for module content. ANDROID_RUNTIME_ROOT will take over
the responsibility. It remains a variable to unify host
and device treatment.

Some test methods (SetUpAndroidData, TearDownAndroidData
SetUpAndroidRoot) have been renamed to clarify their purpose.

Bug: 119935277
Test: build / treehugger
Change-Id: I7c7de52911cbfa56cef90270425ed369176c4767
---
 runtime/parsed_options_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/parsed_options_test.cc')

diff --git a/runtime/parsed_options_test.cc b/runtime/parsed_options_test.cc
index 9e5d9abe3b..705cc6c5e2 100644
--- a/runtime/parsed_options_test.cc
+++ b/runtime/parsed_options_test.cc
@@ -26,7 +26,7 @@ namespace art {
 class ParsedOptionsTest : public ::testing::Test {
  public:
   static void SetUpTestCase() {
-    CommonRuntimeTest::SetUpAndroidRoot();
+    CommonRuntimeTest::SetUpAndroidRootEnvVars();
   }
 };
 
-- 
cgit v1.2.3-59-g8ed1b