| commit | 2420bd2dc83b3cdc468d710b6be2db06cc627dd6 | [log] [tgz] |
|---|---|---|
| author | Kristian Monsen <kristianm@google.com> | Tue Feb 25 19:41:09 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 25 19:41:09 2014 +0000 |
| tree | 1beb97cb943610e95d206eb5b8258d4e678d4c9f | |
| parent | df3da5a71c1ce1b2b82615baf934c2b14534f81a [diff] | |
| parent | 3cf91d84d7965117b1fc20ca19653bfaea62114f [diff] |
Merge "Revert "Fix multi-arch build for x86""
diff --git a/Android.mk b/Android.mk index 1b31c6f..275178c 100644 --- a/Android.mk +++ b/Android.mk
@@ -51,11 +51,6 @@ 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 \