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/elf_writer.h

diff --git a/src/elf_writer.h b/src/elf_writer.h
index 6f22db1..1dd0131 100644
--- a/src/elf_writer.h
+++ b/src/elf_writer.h
@@ -50,7 +50,7 @@
   static bool Create(File* file,
                      std::vector<uint8_t>& oat_contents,
                      const std::vector<const DexFile*>& dex_files,
-                     const std::string* host_prefix,
+                     const std::string& android_root,
                      bool is_host,
                      const CompilerDriver& driver)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
@@ -75,7 +75,7 @@
 
   bool Write(std::vector<uint8_t>& oat_contents,
              const std::vector<const DexFile*>& dex_files,
-             const std::string* host_prefix,
+             const std::string& android_root,
              bool is_host)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
@@ -83,7 +83,7 @@
   void AddOatInput(std::vector<uint8_t>& oat_contents);
   void AddMethodInputs(const std::vector<const DexFile*>& dex_files);
   void AddCompiledCodeInput(const CompiledCode& compiled_code);
-  void AddRuntimeInputs(const std::string* host_prefix, bool is_host);
+  void AddRuntimeInputs(const std::string& android_root, bool is_host);
   bool Link();
 #if defined(ART_USE_PORTABLE_COMPILER)
   void FixupOatMethodOffsets(const std::vector<const DexFile*>& dex_files)