| commit | 0d909f54d46a5c4e5143a0469f77472673fdd06a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 15 09:34:44 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 15 09:34:44 2012 -0700 |
| tree | 5262411d344ae7c2bdcd08c1a504517d23a00484 | |
| parent | 22f3a8490a46f905da28694195f0ab674343bc8b [diff] | |
| parent | b74155602a0d3b88f821f49be09c5db5724dabec [diff] |
resolved conflicts for merge of b7415560 to jb-mr1-dev Change-Id: I74a2c85a5d00e9e18a1b41753be92b1c4eef39c6
diff --git a/tsan/Android.mk b/tsan/Android.mk index a409d0c..7716bce 100644 --- a/tsan/Android.mk +++ b/tsan/Android.mk
@@ -24,7 +24,8 @@ -DVGO_linux=1 \ -DVGP_$(TARGET_ARCH)_linux=1 \ -DVG_PLATFORM=\"$(TARGET_ARCH)-linux\" \ - -D_STLP_NO_IOSTREAMS=1 + -D_STLP_NO_IOSTREAMS=1 \ + -U_FORTIFY_SOURCE common_includes := \ external/valgrind/main \