summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh2014-10-06 15:27:20 -0500
committerChih-Hung Hsieh2014-10-06 15:33:25 -0500
commit60c57dad4ec0653d9ce73f6f7147324beb1ce0a5 (patch)
tree0f608d6ed0c2db6ad8855a5f5041689fd0c8894f /libpixelflinger
parentb1dd4af7c41dc0d73f9431ec7adabc342e13434e (diff)
downloadplatform-system-core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.tar.gz
platform-system-core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.tar.xz
platform-system-core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.zip
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')
-rw-r--r--libpixelflinger/Android.mk8
-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
4 files changed, 15 insertions, 0 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk
index 6a3a58f8b..da9829de1 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -69,6 +69,10 @@ ifneq ($(BUILD_TINY_ANDROID),true)
69LOCAL_SHARED_LIBRARIES += libhardware_legacy 69LOCAL_SHARED_LIBRARIES += libhardware_legacy
70LOCAL_CFLAGS += -DWITH_LIB_HARDWARE 70LOCAL_CFLAGS += -DWITH_LIB_HARDWARE
71endif 71endif
72# t32cb16blend.S does not compile with Clang.
73LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
74# arch-arm64/col32cb16blend.S does not compile with Clang.
75LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
72include $(BUILD_SHARED_LIBRARY) 76include $(BUILD_SHARED_LIBRARY)
73 77
74# 78#
@@ -82,6 +86,10 @@ LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm)
82LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64) 86LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64)
83LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips) 87LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips)
84LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) 88LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)
89# t32cb16blend.S does not compile with Clang.
90LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
91# arch-arm64/col32cb16blend.S does not compile with Clang.
92LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
85include $(BUILD_STATIC_LIBRARY) 93include $(BUILD_STATIC_LIBRARY)
86 94
87 95
diff --git a/libpixelflinger/tests/arch-arm64/assembler/Android.mk b/libpixelflinger/tests/arch-arm64/assembler/Android.mk
index eca36ef55..961f323de 100644
--- a/libpixelflinger/tests/arch-arm64/assembler/Android.mk
+++ b/libpixelflinger/tests/arch-arm64/assembler/Android.mk
@@ -5,6 +5,9 @@ LOCAL_SRC_FILES:= \
5 arm64_assembler_test.cpp\ 5 arm64_assembler_test.cpp\
6 asm_test_jacket.S 6 asm_test_jacket.S
7 7
8# asm_test_jacket.S does not compile with Clang.
9LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
10
8LOCAL_SHARED_LIBRARIES := \ 11LOCAL_SHARED_LIBRARIES := \
9 libcutils \ 12 libcutils \
10 libpixelflinger 13 libpixelflinger
diff --git a/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk b/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
index 3368eb017..5d69203b4 100644
--- a/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
+++ b/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
@@ -5,6 +5,8 @@ LOCAL_SRC_FILES:= \
5 col32cb16blend_test.c \ 5 col32cb16blend_test.c \
6 ../../../arch-arm64/col32cb16blend.S 6 ../../../arch-arm64/col32cb16blend.S
7 7
8LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
9
8LOCAL_SHARED_LIBRARIES := 10LOCAL_SHARED_LIBRARIES :=
9 11
10LOCAL_C_INCLUDES := 12LOCAL_C_INCLUDES :=
diff --git a/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk b/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
index 8e5ec5e01..2c1379bd7 100644
--- a/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
+++ b/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
@@ -5,6 +5,8 @@ LOCAL_SRC_FILES:= \
5 t32cb16blend_test.c \ 5 t32cb16blend_test.c \
6 ../../../arch-arm64/t32cb16blend.S 6 ../../../arch-arm64/t32cb16blend.S
7 7
8LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
9
8LOCAL_SHARED_LIBRARIES := 10LOCAL_SHARED_LIBRARIES :=
9 11
10LOCAL_C_INCLUDES := 12LOCAL_C_INCLUDES :=