diff options
| author | Christopher Ferris <cferris@google.com> | 2014-10-15 18:08:41 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-10-16 11:35:27 -0700 |
| commit | 286aca5d368369ddbd7ca4d429c2c9ee8091d187 (patch) | |
| tree | edb59a698a6ca0e6d86ea7f10700119b123aae29 /CtsBuild.mk | |
| parent | 2c254c4ae4abdc1e6adad255134a8fac2936f17c (diff) | |
| download | platform_cts-286aca5d368369ddbd7ca4d429c2c9ee8091d187.tar.gz platform_cts-286aca5d368369ddbd7ca4d429c2c9ee8091d187.tar.bz2 platform_cts-286aca5d368369ddbd7ca4d429c2c9ee8091d187.zip | |
Add cts native test multilib support.
- Add support for marking a single test as not supported by an abi.
- Add four bionic tests that do not run on 64 bit abis.
- Make all native test executables end in 32/64 depending on the abi.
- For 64 bit abis, force the inclusion of the 64 bit test executable.
- Modify the native gtest runner to append 32/64 to the executable
depending on the bitness of the abi.
Bug: 17927956
Change-Id: Ie36a189f65c901b16041e4e7db8d806480a9861a
Diffstat (limited to 'CtsBuild.mk')
| -rw-r--r-- | CtsBuild.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CtsBuild.mk b/CtsBuild.mk index 12a90473cce..dbe93c780e9 100644 --- a/CtsBuild.mk +++ b/CtsBuild.mk @@ -47,7 +47,7 @@ define cts-get-ui-lib-paths endef define cts-get-native-paths - $(foreach exe,$(1),$(call intermediates-dir-for,EXECUTABLES,$(exe))/$(exe)) + $(foreach exe,$(1),$(call intermediates-dir-for,EXECUTABLES,$(exe),,,$(3))/$(exe)$(2)) endef define cts-get-package-paths |