Merge "Fix dex2oat cross-compilation."
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index ef97d03..0e930ee 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -212,8 +212,7 @@
art_debug_cflags := \
-O2 \
-DDYNAMIC_ANNOTATIONS_ENABLED=1 \
- -UNDEBUG \
- -fkeep-inline-functions
+ -UNDEBUG
art_host_non_debug_cflags := $(art_non_debug_cflags)
art_target_non_debug_cflags := $(art_non_debug_cflags)
diff --git a/runtime/instruction_set_test.cc b/runtime/instruction_set_test.cc
index 948063d..3f2d16b 100644
--- a/runtime/instruction_set_test.cc
+++ b/runtime/instruction_set_test.cc
@@ -221,7 +221,12 @@
}
#endif
+#if defined(__arm__)
+TEST_F(InstructionSetTest, DISABLED_FeaturesFromCpuInfo) {
+ LOG(WARNING) << "Test disabled due to buggy ARM kernels";
+#else
TEST_F(InstructionSetTest, FeaturesFromCpuInfo) {
+#endif
// Take the default set of instruction features from the build.
std::unique_ptr<const InstructionSetFeatures> instruction_set_features(
InstructionSetFeatures::FromCppDefines());
@@ -234,7 +239,12 @@
<< "\nFeatures from build: " << *instruction_set_features.get();
}
+#if defined(__arm__)
+TEST_F(InstructionSetTest, DISABLED_FeaturesFromHwcap) {
+ LOG(WARNING) << "Test disabled due to buggy ARM kernels";
+#else
TEST_F(InstructionSetTest, FeaturesFromHwcap) {
+#endif
// Take the default set of instruction features from the build.
std::unique_ptr<const InstructionSetFeatures> instruction_set_features(
InstructionSetFeatures::FromCppDefines());
@@ -248,7 +258,12 @@
}
+#if defined(__arm__)
+TEST_F(InstructionSetTest, DISABLED_FeaturesFromAssembly) {
+ LOG(WARNING) << "Test disabled due to buggy ARM kernels";
+#else
TEST_F(InstructionSetTest, FeaturesFromAssembly) {
+#endif
// Take the default set of instruction features from the build.
std::unique_ptr<const InstructionSetFeatures> instruction_set_features(
InstructionSetFeatures::FromCppDefines());