From fb6a5c00ef02cda7ea919d717daaf46abd0414e4 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Fri, 29 Mar 2019 20:20:16 +0000 Subject: Add and use art::GetAndroidRuntimeBinDir. This method returns the location of the directory containing the Android Runtime binaries, which is expected to be the Android Runtime APEX's bin directory on target and the Android Root's bin directory on host (at least for now). Also remove art::CommonArtTestImpl::GetTestAndroidRoot as it is no longer used. Test: ART gtests on host and target Bug: 121117762 Change-Id: I4593bbd4d675ca9d3f7b708482aac82c1892a9ad --- dexlist/dexlist_test.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dexlist/dexlist_test.cc') diff --git a/dexlist/dexlist_test.cc b/dexlist/dexlist_test.cc index 39e5f8cd99..32bc735487 100644 --- a/dexlist/dexlist_test.cc +++ b/dexlist/dexlist_test.cc @@ -41,8 +41,7 @@ class DexListTest : public CommonRuntimeTest { // Runs test with given arguments. bool Exec(const std::vector& args, std::string* error_msg) { - std::string file_path = GetTestAndroidRoot(); - file_path += "/bin/dexlist"; + std::string file_path = GetAndroidRuntimeBinDir() + "/dexlist"; EXPECT_TRUE(OS::FileExists(file_path.c_str())) << file_path << " should be a valid file path"; std::vector exec_argv = { file_path }; exec_argv.insert(exec_argv.end(), args.begin(), args.end()); -- cgit v1.2.3-59-g8ed1b