diff options
| author | 2013-03-07 00:02:40 -0800 | |
|---|---|---|
| committer | 2013-03-07 00:02:40 -0800 | |
| commit | 3f47c12487250f61f3be95e9f275e3b08e2c49fb (patch) | |
| tree | 940732d0835af1cf80e8ec41eac6cafaca102a4c /src/compiler/driver/compiler_driver.cc | |
| parent | 650d7a60716a05680f13d2bd9190b633507e958f (diff) | |
Fix portable build on build server by removing depenency on ANDROID_HOST_OUT
Change-Id: I713a156468d14e07c784013c3c37a18c3c075a71
Diffstat (limited to 'src/compiler/driver/compiler_driver.cc')
| -rw-r--r-- | src/compiler/driver/compiler_driver.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/driver/compiler_driver.cc b/src/compiler/driver/compiler_driver.cc index 8856a00597..8556cc8366 100644 --- a/src/compiler/driver/compiler_driver.cc +++ b/src/compiler/driver/compiler_driver.cc @@ -1793,13 +1793,13 @@ bool CompilerDriver::RequiresConstructorBarrier(Thread* self, const DexFile* dex 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 @@ bool CompilerDriver::WriteElf(const std::string* host_prefix, 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 { |