merge from open-source master
Change-Id: I72922bd787ea0fbc199d9362e1cd1d2ed8283b57
This commit is contained in:
commit
4f6d526d60
1 changed files with 7 additions and 0 deletions
|
@ -53,6 +53,7 @@ endif
|
|||
## Define arm-vs-thumb-mode flags.
|
||||
###########################################################
|
||||
LOCAL_ARM_MODE := $(strip $(LOCAL_ARM_MODE))
|
||||
ifeq ($(TARGET_ARCH),arm)
|
||||
arm_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),arm)
|
||||
normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb)
|
||||
|
||||
|
@ -61,6 +62,12 @@ normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb)
|
|||
# actually used (although they are usually empty).
|
||||
arm_objects_cflags := $($(my_prefix)$(arm_objects_mode)_CFLAGS)
|
||||
normal_objects_cflags := $($(my_prefix)$(normal_objects_mode)_CFLAGS)
|
||||
else
|
||||
arm_objects_mode :=
|
||||
normal_objects_mode :=
|
||||
arm_objects_cflags :=
|
||||
normal_objects_cflags :=
|
||||
endif
|
||||
|
||||
###########################################################
|
||||
## Define per-module debugging flags. Users can turn on
|
||||
|
|
Loading…
Reference in a new issue