commit 1bd2ceb3a8c68ae6ea1f9627b588a7bc7a74487f
author Brian Carlstrom <bdc@google.com> Wed Nov 06 00:29:48 2013 -0800
committer Brian Carlstrom <bdc@google.com> Wed Nov 06 01:33:25 2013 -0800
tree c475526366695c9efe1fcf80da732736255167e7
parent a3d2718d1fac53210b2a311b1728409d6c8e7b9d

Make missing DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES an error

Change-Id: I3ca23e4db80c8ab8a86da6408cf38daccd4cfaf1

runtime/common_test.h

diff --git a/runtime/common_test.h b/runtime/common_test.h
index 79fa680..643ed1d 100644
--- a/runtime/common_test.h
+++ b/runtime/common_test.h
@@ -423,13 +423,9 @@
 
       InstructionSet instruction_set = kNone;
 
-      // take the default set of instruction features from the build if present
+      // Take the default set of instruction features from the build.
       InstructionSetFeatures instruction_set_features =
-#ifdef ART_DEFAULT_INSTRUCTION_SET_FEATURES
-        ParseFeatureList(STRINGIFY(ART_DEFAULT_INSTRUCTION_SET_FEATURES));
-#else
-        ParseFeatureList("default");
-#endif
+          ParseFeatureList(STRINGIFY(ART_DEFAULT_INSTRUCTION_SET_FEATURES));
 
 #if defined(__arm__)
       instruction_set = kThumb2;