Follow up to "Add ISA directory to image and odex pathnames."
Change-Id: I7f08cc3052fbed93a56ccf1ab7675ae8bc129da9
diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h
index 3b071d1..9831861 100644
--- a/runtime/gc/heap.h
+++ b/runtime/gc/heap.h
@@ -144,7 +144,7 @@
size_t max_free, double target_utilization,
double foreground_heap_growth_multiplier, size_t capacity,
const std::string& original_image_file_name,
- const InstructionSet image_instruction_set,
+ InstructionSet image_instruction_set,
CollectorType foreground_collector_type, CollectorType background_collector_type,
size_t parallel_gc_threads, size_t conc_gc_threads, bool low_memory_mode,
size_t long_pause_threshold, size_t long_gc_threshold,
diff --git a/runtime/gc/space/image_space.h b/runtime/gc/space/image_space.h
index 622371f..1dc6c57 100644
--- a/runtime/gc/space/image_space.h
+++ b/runtime/gc/space/image_space.h
@@ -43,13 +43,13 @@
// creation of the alloc space. The ReleaseOatFile will later be
// used to transfer ownership of the OatFile to the ClassLinker when
// it is initialized.
- static ImageSpace* Create(const char* image, const InstructionSet image_isa)
+ static ImageSpace* Create(const char* image, InstructionSet image_isa)
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
// Reads the image header from the specified image location for the
// instruction set image_isa.
static ImageHeader* ReadImageHeaderOrDie(const char* image_location,
- const InstructionSet image_isa);
+ InstructionSet image_isa);
// Releases the OatFile from the ImageSpace so it can be transfer to
// the caller, presumably the ClassLinker.
@@ -114,7 +114,7 @@
//
// Returns true if an image was found, false otherwise.
static bool FindImageFilename(const char* image_location,
- const InstructionSet image_isa,
+ InstructionSet image_isa,
std::string* location,
bool* is_system);