ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 4fceda2b: Merge "Add -no-integrated-as at local level."

Browse source 
* commit '4fceda2b53dd2b7537bb65cb6ee0d61bee5ab66c':
  Add -no-integrated-as at local level.
This commit is contained in:
Chih-Hung Hsieh 2014-10-06 22:31:26 +00:00 • committed by Android Git Automerger
commit ad0ff1d99c
5 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libcutils/Android.mk
View file

@ -121,6 +121,9 @@ LOCAL_SRC_FILES := $(commonSources) \
LOCAL_SRC_FILES_arm += \ LOCAL_SRC_FILES_arm += \
arch-arm/memset32.S \ arch-arm/memset32.S \
# arch-arm/memset32.S does not compile with Clang.
LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
LOCAL_SRC_FILES_arm64 += \ LOCAL_SRC_FILES_arm64 += \
arch-arm64/android_memset.S \ arch-arm64/android_memset.S \

8
libpixelflinger/Android.mk
View file

@ -69,6 +69,10 @@ ifneq ($(BUILD_TINY_ANDROID),true)
LOCAL_SHARED_LIBRARIES += libhardware_legacy LOCAL_SHARED_LIBRARIES += libhardware_legacy
LOCAL_CFLAGS += -DWITH_LIB_HARDWARE LOCAL_CFLAGS += -DWITH_LIB_HARDWARE
endif 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) 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_arm64 := $(PIXELFLINGER_SRC_FILES_arm64)
LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips) LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips)
LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) 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) include $(BUILD_STATIC_LIBRARY)

3
libpixelflinger/tests/arch-arm64/assembler/Android.mk
View file

@ -5,6 +5,9 @@ LOCAL_SRC_FILES:= \
arm64_assembler_test.cpp\ arm64_assembler_test.cpp\
asm_test_jacket.S asm_test_jacket.S
# asm_test_jacket.S does not compile with Clang.
LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libpixelflinger libpixelflinger

2
libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
View file

@ -5,6 +5,8 @@ LOCAL_SRC_FILES:= \
col32cb16blend_test.c \ col32cb16blend_test.c \
../../../arch-arm64/col32cb16blend.S ../../../arch-arm64/col32cb16blend.S
LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
LOCAL_SHARED_LIBRARIES := LOCAL_SHARED_LIBRARIES :=
LOCAL_C_INCLUDES := LOCAL_C_INCLUDES :=

2
libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
View file

@ -5,6 +5,8 @@ LOCAL_SRC_FILES:= \
t32cb16blend_test.c \ t32cb16blend_test.c \
../../../arch-arm64/t32cb16blend.S ../../../arch-arm64/t32cb16blend.S
LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
LOCAL_SHARED_LIBRARIES := LOCAL_SHARED_LIBRARIES :=
LOCAL_C_INCLUDES := LOCAL_C_INCLUDES :=