commit 7fcba11846d3320911aefdba6a20c1192e36fc2e
author Brian Carlstrom <bdc@google.com> Mon Jul 22 10:28:48 2013 -0700
committer Brian Carlstrom <bdc@google.com> Mon Jul 22 10:29:14 2013 -0700
tree 11f24dfa522624d6333217be228ea5f535719501
parent 669af5ff17793ba9dcb61570cc762ff33ba47468

Restore conditional oat file copying used by build system.

Change-Id: I40343e59902e894f7343e9d8bbf30f7b5602d786

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index 995f6d4..0e32f0b 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -1032,7 +1032,6 @@
     return EXIT_SUCCESS;
   }
 
-#if ART_USE_PORTABLE_COMPILER  // We currently only generate symbols on Portable
   // If we don't want to strip in place, copy from unstripped location to stripped location.
   // We need to strip after image creation because FixupElf needs to use .strtab.
   if (oat_unstripped != oat_stripped) {
@@ -1054,6 +1053,7 @@
     LOG(INFO) << "Oat file copied successfully (stripped): " << oat_stripped;
   }
 
+#if ART_USE_PORTABLE_COMPILER  // We currently only generate symbols on Portable
   // Strip unneeded sections for target
   off_t seek_actual = lseek(oat_file->Fd(), 0, SEEK_SET);
   CHECK_EQ(0, seek_actual);