diff options
| author | 2020-04-24 09:36:45 -0700 | |
|---|---|---|
| committer | 2020-05-05 21:12:37 +0000 | |
| commit | 5477b8e55f01a58fac188f272818b38a19c50d4e (patch) | |
| tree | e6e345925412d7bd3f6f1e46d9c47833c23bdb40 /libartbase/base/common_art_test.cc | |
| parent | ed2895678203365b2024c742f51d34791729900b (diff) | |
Allow bootjars in system_ext.
Bug: 148385042
Test: Built and booted Pixel 3a both with and without a boot jar in system_ext.
Test: m test-art-host-gtest-hidden_api_test32
Test: m test-art-host-gtest-hidden_api_test64
Change-Id: I10ef0340b92aa60579ff39f888cb556dc2953f2a
Diffstat (limited to 'libartbase/base/common_art_test.cc')
| -rw-r--r-- | libartbase/base/common_art_test.cc | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/libartbase/base/common_art_test.cc b/libartbase/base/common_art_test.cc index 62535a482d..537d992d75 100644 --- a/libartbase/base/common_art_test.cc +++ b/libartbase/base/common_art_test.cc @@ -256,9 +256,21 @@ void CommonArtTestImpl::SetUpAndroidDataDir(std::string& android_data) { void CommonArtTestImpl::SetUp() { SetUpAndroidRootEnvVars(); SetUpAndroidDataDir(android_data_); + + // Re-use the data temporary directory for /system_ext tests + android_system_ext_.append(android_data_.c_str()); + android_system_ext_.append("/system_ext"); + int mkdir_result = mkdir(android_system_ext_.c_str(), 0700); + ASSERT_EQ(mkdir_result, 0); + setenv("ANDROID_SYSTEM_EXT", android_system_ext_.c_str(), 1); + + std::string system_ext_framework = android_system_ext_ + "/framework"; + mkdir_result = mkdir(system_ext_framework.c_str(), 0700); + ASSERT_EQ(mkdir_result, 0); + dalvik_cache_.append(android_data_.c_str()); dalvik_cache_.append("/dalvik-cache"); - int mkdir_result = mkdir(dalvik_cache_.c_str(), 0700); + mkdir_result = mkdir(dalvik_cache_.c_str(), 0700); ASSERT_EQ(mkdir_result, 0); static bool gSlowDebugTestFlag = false; @@ -394,8 +406,12 @@ void CommonArtTestImpl::TearDown() { ClearDirectory(dalvik_cache_.c_str()); int rmdir_cache_result = rmdir(dalvik_cache_.c_str()); ASSERT_EQ(0, rmdir_cache_result); + ClearDirectory(android_system_ext_.c_str(), true); + rmdir_cache_result = rmdir(android_system_ext_.c_str()); + ASSERT_EQ(0, rmdir_cache_result); TearDownAndroidDataDir(android_data_, true); dalvik_cache_.clear(); + android_system_ext_.clear(); } static std::string GetDexFileName(const std::string& jar_prefix, bool host) { |