diff options
| author | Kristian Monsen <kristianm@google.com> | 2014-02-25 19:41:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-25 19:41:09 +0000 |
| commit | 2420bd2dc83b3cdc468d710b6be2db06cc627dd6 (patch) | |
| tree | 1beb97cb943610e95d206eb5b8258d4e678d4c9f | |
| parent | df3da5a71c1ce1b2b82615baf934c2b14534f81a (diff) | |
| parent | 3cf91d84d7965117b1fc20ca19653bfaea62114f (diff) | |
| download | chromium-2420bd2dc83b3cdc468d710b6be2db06cc627dd6.tar.gz | |
Merge "Revert "Fix multi-arch build for x86""
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -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 \ |