diff options
| author | Ying Wang <wangying@google.com> | 2015-03-12 15:35:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-12 15:35:53 +0000 |
| commit | 25c894bf70044225ec1b321ddd76557dade68ee0 (patch) | |
| tree | c216e649815ffeaf6826cd11c917e83c85f6a714 /core/binary.mk | |
| parent | ab27f6e775699bdbc8ea62835080403d5c5e3347 (diff) | |
| parent | ec447f368a0622781a0b6f95d422d30f480a24b5 (diff) | |
| download | build-25c894bf70044225ec1b321ddd76557dade68ee0.zip build-25c894bf70044225ec1b321ddd76557dade68ee0.tar.gz build-25c894bf70044225ec1b321ddd76557dade68ee0.tar.bz2 | |
am ec447f36: am 168357ae: Merge "Support .asm being compiled by yasm targeted for x86_64."
* commit 'ec447f368a0622781a0b6f95d422d30f480a24b5':
Support .asm being compiled by yasm targeted for x86_64.
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/binary.mk b/core/binary.mk index a9b9e65..154e8ab 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -804,8 +804,7 @@ endif asm_objects := $(asm_objects_S) $(asm_objects_s) -# .asm for x86 needs to be compiled with yasm. -ifeq (x86,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) +# .asm for x86/x86_64 needs to be compiled with yasm. asm_sources_asm := $(filter %.asm,$(my_src_files)) ifneq ($(strip $(asm_sources_asm)),) asm_objects_asm := $(addprefix $(intermediates)/,$(asm_sources_asm:.asm=.o)) @@ -815,7 +814,6 @@ $(asm_objects_asm): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.asm \ asm_objects += $(asm_objects_asm) endif -endif ########################################################## |