summaryrefslogtreecommitdiffstats
path: root/libpixelflinger/tests
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-10-06 13:27:20 -0700
committerChih-Hung Hsieh <chh@google.com>2014-10-06 13:33:25 -0700
commit60c57dad4ec0653d9ce73f6f7147324beb1ce0a5 (patch)
tree0f608d6ed0c2db6ad8855a5f5041689fd0c8894f /libpixelflinger/tests
parentb1dd4af7c41dc0d73f9431ec7adabc342e13434e (diff)
downloadsystem_core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.zip
system_core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.tar.gz
system_core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.tar.bz2
Add -no-integrated-as at local level.
Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: I1beed3e75d074d970fa9112ec1c0f0df3d43947a
Diffstat (limited to 'libpixelflinger/tests')
-rw-r--r--libpixelflinger/tests/arch-arm64/assembler/Android.mk3
-rw-r--r--libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk2
-rw-r--r--libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk2
3 files changed, 7 insertions, 0 deletions
diff --git a/libpixelflinger/tests/arch-arm64/assembler/Android.mk b/libpixelflinger/tests/arch-arm64/assembler/Android.mk
index eca36ef..961f323 100644
--- a/libpixelflinger/tests/arch-arm64/assembler/Android.mk
+++ b/libpixelflinger/tests/arch-arm64/assembler/Android.mk
@@ -5,6 +5,9 @@ LOCAL_SRC_FILES:= \
arm64_assembler_test.cpp\
asm_test_jacket.S
+# asm_test_jacket.S does not compile with Clang.
+LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
+
LOCAL_SHARED_LIBRARIES := \
libcutils \
libpixelflinger
diff --git a/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk b/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
index 3368eb0..5d69203 100644
--- a/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
+++ b/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
@@ -5,6 +5,8 @@ LOCAL_SRC_FILES:= \
col32cb16blend_test.c \
../../../arch-arm64/col32cb16blend.S
+LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
+
LOCAL_SHARED_LIBRARIES :=
LOCAL_C_INCLUDES :=
diff --git a/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk b/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
index 8e5ec5e..2c1379b 100644
--- a/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
+++ b/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
@@ -5,6 +5,8 @@ LOCAL_SRC_FILES:= \
t32cb16blend_test.c \
../../../arch-arm64/t32cb16blend.S
+LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
+
LOCAL_SHARED_LIBRARIES :=
LOCAL_C_INCLUDES :=