commit daea3fce402d7e10f224f97552f6890a26da31ed
author Jean-Baptiste Queru <jbq@google.com> Fri Jul 09 10:44:37 2010 -0700
committer Android Code Review <code-review@android.com> Fri Jul 09 10:44:37 2010 -0700
tree 2eb9ba18bfa1b1cc1d6bfe36383c00194b2a5f69
parent f5f11eb01c7f2ea82e5cd91824bf4e053d4dfd69
parent 0d09e587aaa52fe1d3f1bfdd6faec9c5e232e1df

Merge "Set arm specific variables to be empty for non-arm platforms"

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index d5528b1..2f0a243 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -53,6 +53,7 @@
 ## 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 @@
 # 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