| commit | 19211210d3c966ef856d8ca182abf8d78f1e7cbf | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 15 09:39:38 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 09:39:38 2012 -0700 |
| tree | d6becc01cda4726097a1cea2500974904fbd62da | |
| parent | 4948b9028c5a7f1307d7692bf5c27ec29ff42e06 [diff] | |
| parent | 0d909f54d46a5c4e5143a0469f77472673fdd06a [diff] |
am 0d909f54: resolved conflicts for merge of b7415560 to jb-mr1-dev * commit '0d909f54d46a5c4e5143a0469f77472673fdd06a': Clean up handling of multiple architectures in valgrind makefiles.
diff --git a/main/Android.mk b/main/Android.mk index 70ed5ec..844a0e6 100644 --- a/main/Android.mk +++ b/main/Android.mk
@@ -241,7 +241,9 @@ LOCAL_LDFLAGS := $(vex_ldflags) +# TODO: split asflags out from cflags. LOCAL_CFLAGS := $(common_cflags) +LOCAL_ASFLAGS := $(common_cflags) include $(BUILD_STATIC_LIBRARY)