commit 654d91957edb4d1f7534ed5d743cf914db763448
author Brian Carlstrom <bdc@google.com> Tue Apr 30 18:35:32 2013 -0700
committer Brian Carlstrom <bdc@google.com> Tue Apr 30 18:37:22 2013 -0700
tree f87cb1349f2eff97cd4f5edd4b015b4b2a4ff072
parent 10c35dc16aea5b77f201f42fac4b39523e6ceed7

Add conscrypt to art tests

Change-Id: I26694517d398b0f84f48c7496c3159b7863fa833

src/common_test.h

diff --git a/src/common_test.h b/src/common_test.h
index 6876274..78d86d2 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -311,7 +311,9 @@
     ASSERT_EQ(mkdir_result, 0);
 
     java_lang_dex_file_ = DexFile::Open(GetLibCoreDexFileName(), GetLibCoreDexFileName());
+    conscrypt_file_ = DexFile::Open(GetConscryptFileName(), GetConscryptFileName());
     boot_class_path_.push_back(java_lang_dex_file_);
+    boot_class_path_.push_back(conscrypt_file_);
 
     std::string min_heap_string(StringPrintf("-Xms%zdm", Heap::kDefaultInitialSize / MB));
     std::string max_heap_string(StringPrintf("-Xmx%zdm", Heap::kDefaultMaximumSize / MB));
@@ -416,6 +418,10 @@
     return GetDexFileName("core");
   }
 
+  std::string GetConscryptFileName() {
+    return GetDexFileName("conscrypt");
+  }
+
   std::string GetDexFileName(const std::string& jar_prefix) {
     if (IsHost()) {
       const char* host_dir = getenv("ANDROID_HOST_OUT");
@@ -529,6 +535,7 @@
   std::string android_data_;
   std::string art_cache_;
   const DexFile* java_lang_dex_file_;  // owned by runtime_
+  const DexFile* conscrypt_file_;  // owned by runtime_
   std::vector<const DexFile*> boot_class_path_;
   UniquePtr<Runtime> runtime_;
   // Owned by the runtime