| commit | 5c1ad33701beac62afbfb144bb6f52755503c9f2 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Sat Jun 21 23:15:24 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Jun 21 03:13:40 2014 +0000 |
| tree | 2818a4e605cdebf75b4fde7c8ada87a6c5341dff | |
| parent | b493c2983016a78de498c3a3aef302b1353dca99 [diff] | |
| parent | 887235845e203fce046c17120e86d4cac4c56035 [diff] |
Merge "Use command line android root in dex2oat to find image."
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index a793513..5f3cd92 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc
@@ -1076,7 +1076,7 @@ bool image = (!image_filename.empty()); if (!image && boot_image_filename.empty()) { - boot_image_filename += GetAndroidRoot(); + boot_image_filename += android_root; boot_image_filename += "/framework/boot.art"; } std::string boot_image_option;