summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2014-02-25 16:42:41 +0000
committerKristian Monsen <kristianm@google.com>2014-02-25 16:42:41 +0000
commit3cf91d84d7965117b1fc20ca19653bfaea62114f (patch)
tree1beb97cb943610e95d206eb5b8258d4e678d4c9f
parent08b004c9938a06bea32288a4b4e40127887ff682 (diff)
downloadchromium-3cf91d84d7965117b1fc20ca19653bfaea62114f.tar.gz
Revert "Fix multi-arch build for x86"
This reverts commit 08b004c9938a06bea32288a4b4e40127887ff682. Change-Id: Ie12a9965554d5cd1d2c2f89d18c7952e155cff98
-rw-r--r--Android.mk5
1 files changed, 0 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 1b31c6f4..275178cd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,11 +51,6 @@ LOCAL_SRC_FILES += \
base/atomicops_internals_x86_gcc.cc
endif
-ifeq ($(TARGET_$(combo_2nd_arch_prefix)ARCH),x86)
-LOCAL_SRC_FILES += \
- base/atomicops_internals_x86_gcc.cc
-endif
-
LOCAL_SRC_FILES += \
base/at_exit.cc \
base/base64.cc \