diff options
| author | Ian Rogers <irogers@google.com> | 2014-04-02 23:18:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-02 23:18:43 +0000 |
| commit | a7a49dd64b2cce5cd3918a01c9cd372931f90dd8 (patch) | |
| tree | 6a92d080b3870b1987bc851c726ba149785b05bb /dex2oat | |
| parent | 40462bcc8b8fbe8a4981a0fb209e10898a118e2c (diff) | |
| parent | 8afeb85d3def12b559b7565fb6d3956f81b55132 (diff) | |
| download | art-a7a49dd64b2cce5cd3918a01c9cd372931f90dd8.zip art-a7a49dd64b2cce5cd3918a01c9cd372931f90dd8.tar.gz art-a7a49dd64b2cce5cd3918a01c9cd372931f90dd8.tar.bz2 | |
Merge "Pass instruction-set from runtime through to spawned dex2oat."
Diffstat (limited to 'dex2oat')
| -rw-r--r-- | dex2oat/dex2oat.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 72effde..552ec89 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -740,7 +740,7 @@ static int dex2oat(int argc, char** argv) { // Take the default set of instruction features from the build. InstructionSetFeatures instruction_set_features = - ParseFeatureList(STRINGIFY(ART_DEFAULT_INSTRUCTION_SET_FEATURES)); + ParseFeatureList(Runtime::GetDefaultInstructionSetFeatures()); #if defined(__arm__) InstructionSet instruction_set = kThumb2; |