Test fixes for modern static libraries.
Unfortunately static executables with libc++ will require API > 26 to
avoid libandroid_support. Fortunately this doesn't actually cause any
issues except in the case of having a static executable in the same
project as other non-static executable modules.
Test: ./run_tests.py
Bug: http://b/24507500
Bug: https://github.com/android-ndk/ndk/issues/593
Change-Id: I925dac426a41326c76bddec691ba8ce227ba5370
diff --git a/tests/device/static-executable-exceptions/jni/Application.mk b/tests/device/static-executable-exceptions/jni/Application.mk
new file mode 100644
index 0000000..2133d20
--- /dev/null
+++ b/tests/device/static-executable-exceptions/jni/Application.mk
@@ -0,0 +1 @@
+APP_PLATFORM := android-21
diff --git a/tests/device/static-executable-exceptions/test_config.py b/tests/device/static-executable-exceptions/test_config.py
index 1c62625..782eacd 100644
--- a/tests/device/static-executable-exceptions/test_config.py
+++ b/tests/device/static-executable-exceptions/test_config.py
@@ -1,7 +1,7 @@
-def run_broken(abi, _device_api, _subtest):
- if abi == 'armeabi-v7a':
- # __gnu_Unwind_Find_exidx has always been broken in libc.a. We need an
- # update to the static libraries to fix this.
- return abi, 'https://github.com/android-ndk/ndk/issues/593'
+def build_unsupported(_abi, api):
+ # Static executables with libc++ require targeting a new enough API level
+ # to not need libandroid_support.
+ if api < 21:
+ return 'android-{}'.format(api)
- return None, None
+ return None
diff --git a/tests/device/wait/test_config.py b/tests/device/wait/test_config.py
deleted file mode 100644
index 1f1546f..0000000
--- a/tests/device/wait/test_config.py
+++ /dev/null
@@ -1,4 +0,0 @@
-def run_broken(abi, device_api, subtest):
- if subtest == 'test_wait-static' and abi == 'x86':
- return abi, 'http://b/24507500'
- return None, None
