diff options
| author | Ying Wang <wangying@android.com> | 2016-01-08 20:30:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-08 20:30:47 +0000 |
| commit | 6d1efdcbf8f9f0448eadf5b343e0dd284bc40208 (patch) | |
| tree | 910adc4ff8b3ca0d2caba29da4ff051b7bb788ec | |
| parent | 2773ffb05268f69b260fe93c6d12dd092e39084b (diff) | |
| parent | 215104ab74622da845152e1574606fd9c7e7a6af (diff) | |
| download | sonivox-6d1efdcbf8f9f0448eadf5b343e0dd284bc40208.tar.gz | |
Merge "Android.mk: make 32bit binary use arm assembly code on 64bit platform"brillo-m9-releasebrillo-m9-dev
| -rw-r--r-- | arm-wt-22k/Android.mk | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/arm-wt-22k/Android.mk b/arm-wt-22k/Android.mk index 75b5463..fd9ca69 100644 --- a/arm-wt-22k/Android.mk +++ b/arm-wt-22k/Android.mk @@ -53,12 +53,12 @@ LOCAL_CFLAGS+= -O2 -D UNIFIED_DEBUG_MESSAGES -D EAS_WT_SYNTH \ -D _8_BIT_SAMPLES -D _FILTER_ENABLED \ -D DLS_SYNTHESIZER \ -D _REVERB_ENABLED - + # not using these options # -D _WAVE_PARSER # -D _IMA_DECODER (needed for IMA-ADPCM wave files) # -D _CHORUS_ENABLED - + LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/host_src \ $(LOCAL_PATH)/lib_src @@ -74,8 +74,7 @@ LOCAL_COPY_HEADERS := \ host_src/eas_reverb.h \ host_src/jet.h -ifeq ($(TARGET_ARCH),arm) -LOCAL_SRC_FILES+= \ +LOCAL_SRC_FILES_arm += \ lib_src/ARM-E_filter_gnu.s \ lib_src/ARM-E_interpolate_loop_gnu.s \ lib_src/ARM-E_interpolate_noloop_gnu.s \ @@ -89,7 +88,7 @@ asm_flags := \ --defsym FILTER_ENABLED=1 \ --defsym SAMPLES_8_BIT=1 -LOCAL_ASFLAGS := \ +LOCAL_ASFLAGS_arm := \ $(foreach f,$(asm_flags),-Wa,"$(f)") # .s files not ported for Clang assembler yet. @@ -98,10 +97,7 @@ LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as asm_flags := -LOCAL_CFLAGS += -D NATIVE_EAS_KERNEL - -LOCAL_COPY_HEADERS += lib_src/ARM_synth_constants_gnu.inc -endif +LOCAL_CFLAGS_arm += -D NATIVE_EAS_KERNEL LOCAL_SHARED_LIBRARIES := \ libutils libcutils |