diff options
| author | Ying Wang <wangying@android.com> | 2016-01-08 20:43:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-08 20:43:15 +0000 |
| commit | e2e3bf4b4dcd0743531bf561500e8677f6b5e778 (patch) | |
| tree | 9c4fd3fa98a2c89cb77e3ad78fcbe6e4739b8879 | |
| parent | 0e117202f4d3db14993acfb1202c5ca5a75d7593 (diff) | |
| parent | 2b786461b084749fbc413e7fecafa94572eb0650 (diff) | |
| download | tremolo-e2e3bf4b4dcd0743531bf561500e8677f6b5e778.tar.gz | |
Merge "Android.mk: make 32bit binary use arm assembly code on 64bit platform" am: bf470a06f3
am: 2b786461b0
* commit '2b786461b084749fbc413e7fecafa94572eb0650':
Android.mk: make 32bit binary use arm assembly code on 64bit platform
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -16,21 +16,22 @@ LOCAL_SRC_FILES = \ Tremolo/treminfo.c \ Tremolo/vorbisfile.c -ifeq ($(TARGET_ARCH),arm) -LOCAL_SRC_FILES += \ +LOCAL_SRC_FILES_arm += \ Tremolo/bitwiseARM.s \ Tremolo/dpen.s \ Tremolo/floor1ARM.s \ Tremolo/mdctARM.s -LOCAL_CFLAGS += \ +LOCAL_CFLAGS_arm += \ -D_ARM_ASSEM_ # Assembly code in asm_arm.h does not compile with Clang. LOCAL_CLANG_ASFLAGS_arm += \ -no-integrated-as -else -LOCAL_CFLAGS += \ - -DONLY_C -endif +LOCAL_CFLAGS_arm64 += -DONLY_C +LOCAL_CFLAGS_mips += -DONLY_C +LOCAL_CFLAGS_mips64 += -DONLY_C +LOCAL_CFLAGS_x86 += -DONLY_C +LOCAL_CFLAGS_x86_64 += -DONLY_C + LOCAL_CFLAGS+= -O2 LOCAL_C_INCLUDES:= \ |