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

Commit 37693fc2 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Pass the arm/thumb cflags to assembly files" am: 60c9200c 

am: 537e093f

* commit '537e093f':
  Pass the arm/thumb cflags to assembly files
parents c2a8b0b6 537e093f

core/binary.mk

+2 −0
Original line number Diff line number Diff line
@@ -909,6 +909,7 @@ $(gen_s_objects): $(intermediates)/%.o: $(intermediates)/%.s \ 
endif



gen_asm_objects := $(gen_S_objects) $(gen_s_objects)

$(gen_asm_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)



###########################################################

## o: Include generated .o files in output.
@@ -1045,6 +1046,7 @@ $(asm_objects_s): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.s \ 
endif



asm_objects := $(dotdot_objects_S) $(dotdot_objects_s) $(asm_objects_S) $(asm_objects_s)

$(asm_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)





# .asm for x86/x86_64 needs to be compiled with yasm.