Merge "Add -no-integrated-as at local level."
This commit is contained in:
commit
4fceda2b53
5 changed files with 18 additions and 0 deletions
|
@ -121,6 +121,9 @@ LOCAL_SRC_FILES := $(commonSources) \
|
|||
LOCAL_SRC_FILES_arm += \
|
||||
arch-arm/memset32.S \
|
||||
|
||||
# arch-arm/memset32.S does not compile with Clang.
|
||||
LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
|
||||
|
||||
LOCAL_SRC_FILES_arm64 += \
|
||||
arch-arm64/android_memset.S \
|
||||
|
||||
|
|
|
@ -69,6 +69,10 @@ ifneq ($(BUILD_TINY_ANDROID),true)
|
|||
LOCAL_SHARED_LIBRARIES += libhardware_legacy
|
||||
LOCAL_CFLAGS += -DWITH_LIB_HARDWARE
|
||||
endif
|
||||
# t32cb16blend.S does not compile with Clang.
|
||||
LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
|
||||
# arch-arm64/col32cb16blend.S does not compile with Clang.
|
||||
LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
#
|
||||
|
@ -82,6 +86,10 @@ LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm)
|
|||
LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64)
|
||||
LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips)
|
||||
LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)
|
||||
# t32cb16blend.S does not compile with Clang.
|
||||
LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
|
||||
# arch-arm64/col32cb16blend.S does not compile with Clang.
|
||||
LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 :=
|
||||
|
|
|
@ -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 :=
|
||||
|
|
Loading…
Reference in a new issue