commit 940cf75277cb1d292d933102a1f4fbdb60f798ee
author Ben Cheng <bccheng@android.com> Fri Dec 06 23:04:16 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 06 23:04:17 2013 +0000
tree bcf49c14a666dd6c385b0bdf2560f53587c456e5
parent 4886329fd53290061515485e7cf3ce497fc1b5b9
parent 50c8738e56f2c1d9fa701000f3cc1912cb95455a

Merge "Fix WITH_ARM_V7_A flag not corectly set issue"

opcontrol/Android.mk

diff --git a/opcontrol/Android.mk b/opcontrol/Android.mk
index 4f41f35..bfeedba 100644
--- a/opcontrol/Android.mk
+++ b/opcontrol/Android.mk
@@ -18,10 +18,6 @@
 # Build opcontrol executable on target
 include $(CLEAR_VARS)
 
-ifeq ($(ARCH_ARM_HAVE_ARMV7A), true)
-    LOCAL_CFLAGS += -DWITH_ARM_V7_A
-endif
-
 LOCAL_SRC_FILES:= \
 	opcontrol.cpp
 
@@ -35,6 +31,10 @@
 LOCAL_C_INCLUDES := $(common_target_c_includes)
 LOCAL_CFLAGS := $(common_target_cflags)
 
+ifeq ($(ARCH_ARM_HAVE_ARMV7A), true)
+    LOCAL_CFLAGS += -DWITH_ARM_V7_A
+endif
+
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE:= opcontrol