summaryrefslogtreecommitdiff
path: root/runtime/parsed_options_test.cc
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2019-03-20 14:22:51 +0000
committer Vladimir Marko <vmarko@google.com> 2019-03-25 10:27:28 +0000
commitb9c29f625bc27968d80f9eafa988dc14af0a1c28 (patch)
tree10276cd3fa756646b41cb50cf396476f2f8df1d3 /runtime/parsed_options_test.cc
parentbcd99bed472d228a1a0a65adc606346d7daf6b93 (diff)
Hide conscrypt package classes for app AOT compilation.
Since app AOT compilation is usually done without conscrypt on the boot class path, classes defined by app class loader in conscrypt packages could be resolved differently, i.e. from conscrypt, at runtime. Reject such definitions during AOT compilation to ensure correct runtime behavior. Add a test that when compiling the conscrypt module as an app, we cannot resolve any class defined in its dex files. Test: module_exclusion_test Bug: 122937705 Change-Id: I1fcb4c21937f59772206ee50b688a75053231bc0
Diffstat (limited to 'runtime/parsed_options_test.cc')
-rw-r--r--runtime/parsed_options_test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/parsed_options_test.cc b/runtime/parsed_options_test.cc
index 77d2316502..ca2a4ea32e 100644
--- a/runtime/parsed_options_test.cc
+++ b/runtime/parsed_options_test.cc
@@ -19,14 +19,14 @@
#include <memory>
#include "arch/instruction_set.h"
-#include "common_runtime_test.h"
+#include "base/common_art_test.h"
namespace art {
-class ParsedOptionsTest : public ::testing::Test {
+class ParsedOptionsTest : public CommonArtTest {
public:
static void SetUpTestCase() {
- CommonRuntimeTest::SetUpAndroidRootEnvVars();
+ CommonArtTest::SetUpAndroidRootEnvVars();
}
};
@@ -40,7 +40,7 @@ TEST_F(ParsedOptionsTest, ParsedOptions) {
boot_class_path += "-Xbootclasspath:";
bool first_dex_file = true;
- for (const std::string &dex_file_name : CommonRuntimeTest::GetLibCoreDexFileNames()) {
+ for (const std::string& dex_file_name : GetLibCoreDexFileNames()) {
if (!first_dex_file) {
class_path += ":";
} else {