summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath2014-06-26 07:22:14 -0500
committerNarayan Kamath2014-06-26 07:22:44 -0500
commit992031c8767ed7f5af35462b77533048aa29fee0 (patch)
tree5c8aaa80742f0d073a77622b0eec806a493bc007 /libpixelflinger
parenta42d5bf0064e8c8ce50b22abe13bb6eed4ea9dac (diff)
downloadplatform-system-core-992031c8767ed7f5af35462b77533048aa29fee0.tar.gz
platform-system-core-992031c8767ed7f5af35462b77533048aa29fee0.tar.xz
platform-system-core-992031c8767ed7f5af35462b77533048aa29fee0.zip
Build pixelflinger tests as native tests, not executables.
This has the side effect of building tests for both 32 and 64 bit, where required. Change-Id: I674800d34b4fa7cc5d34573c96b754ac85777970
Diffstat (limited to 'libpixelflinger')
-rw-r--r--libpixelflinger/tests/arch-arm64/assembler/Android.mk4
-rw-r--r--libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk4
-rw-r--r--libpixelflinger/tests/arch-arm64/disassembler/Android.mk4
-rw-r--r--libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk4
-rw-r--r--libpixelflinger/tests/codegen/Android.mk2
-rw-r--r--libpixelflinger/tests/gglmul/Android.mk2
6 files changed, 14 insertions, 6 deletions
diff --git a/libpixelflinger/tests/arch-arm64/assembler/Android.mk b/libpixelflinger/tests/arch-arm64/assembler/Android.mk
index 36db49c65..eca36ef55 100644
--- a/libpixelflinger/tests/arch-arm64/assembler/Android.mk
+++ b/libpixelflinger/tests/arch-arm64/assembler/Android.mk
@@ -16,4 +16,6 @@ LOCAL_MODULE:= test-pixelflinger-arm64-assembler-test
16 16
17LOCAL_MODULE_TAGS := tests 17LOCAL_MODULE_TAGS := tests
18 18
19include $(BUILD_EXECUTABLE) 19LOCAL_MULTILIB := 64
20
21include $(BUILD_NATIVE_TEST)
diff --git a/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk b/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
index ac890c74d..3368eb017 100644
--- a/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
+++ b/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
@@ -13,4 +13,6 @@ LOCAL_MODULE:= test-pixelflinger-arm64-col32cb16blend
13 13
14LOCAL_MODULE_TAGS := tests 14LOCAL_MODULE_TAGS := tests
15 15
16include $(BUILD_EXECUTABLE) 16LOCAL_MULTILIB := 64
17
18include $(BUILD_NATIVE_TEST)
diff --git a/libpixelflinger/tests/arch-arm64/disassembler/Android.mk b/libpixelflinger/tests/arch-arm64/disassembler/Android.mk
index baf40701b..8f62f0975 100644
--- a/libpixelflinger/tests/arch-arm64/disassembler/Android.mk
+++ b/libpixelflinger/tests/arch-arm64/disassembler/Android.mk
@@ -14,4 +14,6 @@ LOCAL_MODULE:= test-pixelflinger-arm64-disassembler-test
14 14
15LOCAL_MODULE_TAGS := tests 15LOCAL_MODULE_TAGS := tests
16 16
17include $(BUILD_EXECUTABLE) 17LOCAL_MULTILIB := 64
18
19include $(BUILD_NATIVE_TEST)
diff --git a/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk b/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
index 1cce1bdf8..8e5ec5e01 100644
--- a/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
+++ b/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
@@ -13,4 +13,6 @@ LOCAL_MODULE:= test-pixelflinger-arm64-t32cb16blend
13 13
14LOCAL_MODULE_TAGS := tests 14LOCAL_MODULE_TAGS := tests
15 15
16include $(BUILD_EXECUTABLE) 16LOCAL_MULTILIB := 64
17
18include $(BUILD_NATIVE_TEST)
diff --git a/libpixelflinger/tests/codegen/Android.mk b/libpixelflinger/tests/codegen/Android.mk
index aa320fc0a..bc0701559 100644
--- a/libpixelflinger/tests/codegen/Android.mk
+++ b/libpixelflinger/tests/codegen/Android.mk
@@ -15,4 +15,4 @@ LOCAL_MODULE:= test-opengl-codegen
15 15
16LOCAL_MODULE_TAGS := tests 16LOCAL_MODULE_TAGS := tests
17 17
18include $(BUILD_EXECUTABLE) 18include $(BUILD_NATIVE_TEST)
diff --git a/libpixelflinger/tests/gglmul/Android.mk b/libpixelflinger/tests/gglmul/Android.mk
index 64f88b7e3..f479fa1e8 100644
--- a/libpixelflinger/tests/gglmul/Android.mk
+++ b/libpixelflinger/tests/gglmul/Android.mk
@@ -13,4 +13,4 @@ LOCAL_MODULE:= test-pixelflinger-gglmul
13 13
14LOCAL_MODULE_TAGS := tests 14LOCAL_MODULE_TAGS := tests
15 15
16include $(BUILD_EXECUTABLE) 16include $(BUILD_NATIVE_TEST)