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

Commit 81ea7ed4 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am f34c4c71: am 125ddab1: Merge "build: use correct arm vs thumb arguments for 2nd arch builds" 

* commit 'f34c4c71':
  build: use correct arm vs thumb arguments for 2nd arch builds
parents d9926a93 f34c4c71

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ endif 
## Define arm-vs-thumb-mode flags.

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

LOCAL_ARM_MODE := $(strip $(LOCAL_ARM_MODE))

ifeq ($(TARGET_ARCH),arm)

ifeq ($(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH),arm)

arm_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),arm)

normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb)