commit c3494d833d55c6fc086767fd2d006c1b1080ac9a
author Stephen Hines <srhines@google.com> Wed Nov 27 14:00:23 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 27 14:00:23 2013 -0800
tree b05a84218402f55c9a9c3539e59a289fc4f6134a
parent 1418f02306ef4df877da96f9f87c4092c9412ac6
parent ad1267eb72a55ceae0a7e758a251470ed3c64dde

am ad1267eb: (-s ours) Merge "DO NOT MERGE - x86_64: Update makefile to avoid early fail of any other project build"

* commit 'ad1267eb72a55ceae0a7e758a251470ed3c64dde':
  DO NOT MERGE - x86_64: Update makefile to avoid early fail of any other project build

libbcc-device-build.mk

diff --git a/libbcc-device-build.mk b/libbcc-device-build.mk
index 740f0d5..e5a094c 100644
--- a/libbcc-device-build.mk
+++ b/libbcc-device-build.mk
@@ -49,7 +49,7 @@
   ifeq ($(TARGET_ARCH),mips)
     LOCAL_CFLAGS += -DFORCE_MIPS_CODEGEN
   else
-    ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
+    ifeq ($(TARGET_ARCH),x86)
       LOCAL_CFLAGS += -DFORCE_X86_CODEGEN
     else
       $(error Unsupported architecture $(TARGET_ARCH))