Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad0ff1d9 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by Android Git Automerger
Browse files

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

* commit '4fceda2b':
  Add -no-integrated-as at local level.
parents 85cac2ab 4fceda2b

libcutils/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -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 \

libpixelflinger/Android.mk

+8 −0
Original line number Diff line number Diff line
@@ -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)

libpixelflinger/tests/arch-arm64/assembler/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -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

libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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 :=

libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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 :=