Diff - ef5fd436699885f8b5427f5e32029c2ddae122eb^1..ef5fd436699885f8b5427f5e32029c2ddae122eb - platform/external/chromium - Git at Google

commit: ef5fd436699885f8b5427f5e32029c2ddae122eb
[log]
author: Selim Gurun <sgurun@android.com>
Sat Mar 01 04:23:15 2014 +0000
committer: Gerrit Code Review <noreply-gerritcodereview@google.com>
Sat Mar 01 04:23:16 2014 +0000
tree: 3fd8c961adf65161686f50233fa4f82367777752
parent: 2420bd2dc83b3cdc468d710b6be2db06cc627dd6 [diff]
parent: 4def412a6dab47f7da4bd390084599bb1d9d304e [diff]

Merge "Fix multi-arch build for x86"

diff --git a/Android.mk b/Android.mk
index 275178c..09db6e4 100644
--- a/Android.mk
+++ b/Android.mk

@@ -46,7 +46,7 @@
     app/sql/statement.cc \
     app/sql/transaction.cc \
 
-ifeq ($(TARGET_ARCH),x86)
+ifeq ($(TARGET_$(combo_2nd_arch_prefix)ARCH),x86)
 LOCAL_SRC_FILES += \
     base/atomicops_internals_x86_gcc.cc
 endif