commit 3f47c12487250f61f3be95e9f275e3b08e2c49fb
author Brian Carlstrom <bdc@google.com> Thu Mar 07 00:02:40 2013 -0800
committer Brian Carlstrom <bdc@google.com> Thu Mar 07 00:02:40 2013 -0800
tree 940732d0835af1cf80e8ec41eac6cafaca102a4c
parent 650d7a60716a05680f13d2bd9190b633507e958f

Fix portable build on build server by removing depenency on ANDROID_HOST_OUT

Change-Id: I713a156468d14e07c784013c3c37a18c3c075a71

src/compiler/dex/write_elf.cc

diff --git a/src/compiler/dex/write_elf.cc b/src/compiler/dex/write_elf.cc
index 7e3d512..acec531 100644
--- a/src/compiler/dex/write_elf.cc
+++ b/src/compiler/dex/write_elf.cc
@@ -23,13 +23,13 @@
 }  // namespace art
 
 extern "C" bool WriteElf(art::CompilerDriver& driver,
-                         const std::string* host_prefix,
+                         const std::string& android_root,
                          bool is_host,
                          const std::vector<const art::DexFile*>& dex_files,
                          std::vector<uint8_t>& oat_contents,
                          art::File* file)
     SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
-  return art::ElfWriter::Create(file, oat_contents, dex_files, host_prefix, is_host, driver);
+  return art::ElfWriter::Create(file, oat_contents, dex_files, android_root, is_host, driver);
 }
 extern "C" bool FixupElf(art::File* file, uintptr_t oat_data_begin) {
   return art::ElfWriter::Fixup(file, oat_data_begin);

src/compiler/driver/compiler_driver.cc

diff --git a/src/compiler/driver/compiler_driver.cc b/src/compiler/driver/compiler_driver.cc
index 8856a00..8556cc8 100644
--- a/src/compiler/driver/compiler_driver.cc
+++ b/src/compiler/driver/compiler_driver.cc
@@ -1793,13 +1793,13 @@
   return freezing_constructor_classes_.count(ClassReference(dex_file, class_def_index)) != 0;
 }
 
-bool CompilerDriver::WriteElf(const std::string* host_prefix,
+bool CompilerDriver::WriteElf(const std::string& android_root,
                               bool is_host,
                               const std::vector<const DexFile*>& dex_files,
                               std::vector<uint8_t>& oat_contents,
                               File* file) {
   typedef bool (*WriteElfFn)(CompilerDriver&,
-                             const std::string* host_prefix,
+                             const std::string& android_root,
                              bool is_host,
                              const std::vector<const DexFile*>& dex_files,
                              std::vector<uint8_t>&,
@@ -1807,7 +1807,7 @@
   WriteElfFn WriteElf =
     FindFunction<WriteElfFn>(MakeCompilerSoName(compiler_backend_), compiler_library_, "WriteElf");
   Locks::mutator_lock_->AssertSharedHeld(Thread::Current());
-  return WriteElf(*this, host_prefix, is_host, dex_files, oat_contents, file);
+  return WriteElf(*this, android_root, is_host, dex_files, oat_contents, file);
 }
 
 bool CompilerDriver::FixupElf(File* file, uintptr_t oat_data_begin) const {

src/compiler/driver/compiler_driver.h

diff --git a/src/compiler/driver/compiler_driver.h b/src/compiler/driver/compiler_driver.h
index 7f67c21..54a2f55 100644
--- a/src/compiler/driver/compiler_driver.h
+++ b/src/compiler/driver/compiler_driver.h
@@ -187,7 +187,7 @@
   void SetBitcodeFileName(std::string const& filename);
 
   // TODO: remove these Elf wrappers when libart links against LLVM (when separate compiler library is gone)
-  bool WriteElf(const std::string* host_prefix,
+  bool WriteElf(const std::string& android_root,
                 bool is_host,
                 const std::vector<const DexFile*>& dex_files,
                 std::vector<uint8_t>& oat_contents,