diff options
| author | Selim Gurun <sgurun@android.com> | 2014-03-01 04:23:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-01 04:23:16 +0000 |
| commit | ef5fd436699885f8b5427f5e32029c2ddae122eb (patch) | |
| tree | 3fd8c961adf65161686f50233fa4f82367777752 | |
| parent | 2420bd2dc83b3cdc468d710b6be2db06cc627dd6 (diff) | |
| parent | 4def412a6dab47f7da4bd390084599bb1d9d304e (diff) | |
| download | chromium-ef5fd436699885f8b5427f5e32029c2ddae122eb.tar.gz | |
Merge "Fix multi-arch build for x86"
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -46,7 +46,7 @@ LOCAL_SRC_FILES := \ 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 |