diff options
| author | Kristian Monsen <kristianm@google.com> | 2014-02-25 16:07:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-25 16:07:40 +0000 |
| commit | df3da5a71c1ce1b2b82615baf934c2b14534f81a (patch) | |
| tree | ca4713a139d5e3ff94dfd1ed267c2cb09f6b5219 | |
| parent | 6439e3e534d174ee99d2fe6f508dacff53afb86c (diff) | |
| parent | 08b004c9938a06bea32288a4b4e40127887ff682 (diff) | |
| download | chromium-df3da5a71c1ce1b2b82615baf934c2b14534f81a.tar.gz | |
Merge "Fix multi-arch build for x86"
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -51,6 +51,11 @@ 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 \ |