Merge "Contain obj of ../ source files in their intermediate dir."

diff --cc core/binary.mk
index de908e3,7200816..9fa968d
--- 1/core/binary.mk
--- 2/core/binary.mk
+++ b/core/binary.mk
@@@ -791,13 -843,13 +845,12 @@@ ifneq ($(strip $(asm_objects_s)),
  $(asm_objects_s): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.s \
      $(my_additional_dependencies)
        $(transform-$(PRIVATE_HOST)s-to-o-no-deps)
- -include $(asm_objects_s:%.o=%.P)
  endif
  
- asm_objects := $(asm_objects_S) $(asm_objects_s)
+ asm_objects := $(dotdot_objects_S) $(dotdot_objects_s) $(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))

diff --cc core/definitions.mk
Simple merge