Make a test more deterministic, mark as broken.
We removed the BROKEN_BUILD tag from this quite some time ago because
we were always testing with APP_PIE=true. The problem tested does not
appear when using -fPIE, so add -static to prevent that. Now that the
problem is always visible, mark it as broken again.
Change-Id: I7f1f602768c0d70a5e34d15c340757b43605b36f
diff --git a/tests/build/issue65705-asm-pc/jni/Android.mk b/tests/build/issue65705-asm-pc/jni/Android.mk
index 4621057..6261e98 100644
--- a/tests/build/issue65705-asm-pc/jni/Android.mk
+++ b/tests/build/issue65705-asm-pc/jni/Android.mk
@@ -3,4 +3,8 @@
include $(CLEAR_VARS)
LOCAL_MODULE := issue65705-asm-pc
LOCAL_SRC_FILES := issue65705-asm-pc.c
+# Using -static to prevent ndk-build from adding -fPIE even when APP_PIE is set
+# to true from the command line. The compiler bug this test is trying to show is
+# not present when compiling with -fPIE.
+LOCAL_LDFLAGS := -static
include $(BUILD_EXECUTABLE)
diff --git a/tests/build/issue65705-asm-pc/test_config.py b/tests/build/issue65705-asm-pc/test_config.py
index b351758..d78f3f4 100644
--- a/tests/build/issue65705-asm-pc/test_config.py
+++ b/tests/build/issue65705-asm-pc/test_config.py
@@ -1,3 +1,9 @@
+def match_broken(abi, device, toolchain, subtest=None):
+ if toolchain == '4.9':
+ return toolchain, 'http://b.android.com/65705'
+ return None, None
+
+
def match_unsupported(abi, device, toolchain, subtest=None):
if abi not in ('armeabi', 'armeabi-v7a', 'armeabi-v7a-hard'):
return abi
