From 6ea3755330fcd8e5531e341c5460fe147324ccbd Mon Sep 17 00:00:00 2001
From: Frank Barchard <fbarchard@google.com>
Date: Tue, 9 Feb 2016 11:57:03 -0800
Subject: [PATCH] add 'LIBYUV_DISABLE_X86' to msan for unittests

R=harryjin@google.com
BUG=libyuv:564

Review URL: https://codereview.chromium.org/1685723002 .
---
 .gitignore               | 15 +++++++++++++++
 README.chromium          |  2 +-
 include/libyuv/version.h |  2 +-
 libyuv.gyp               |  2 +-
 libyuv_test.gyp          | 26 ++++++++++++++++----------
 5 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index a324d6321..09c1406a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,8 @@ pin-log.txt
 /tools/generate_library_loader
 /tools/gn
 /tools/grit
+/tools/gritsettings/README
+/tools/gritsettings/resource_ids
 /tools/gyp
 /tools/isolate_driver.py
 /tools/memory
@@ -87,6 +89,19 @@ pin-log.txt
 /tools/swarming_client
 /tools/tsan_suppressions
 /tools/valgrind
+/tools/valgrind-libyuv/libyuv_tests.bat
+/tools/valgrind-libyuv/libyuv_tests.py
+/tools/valgrind-libyuv/libyuv_tests.sh
+/tools/valgrind-libyuv/memcheck/OWNERS
+/tools/valgrind-libyuv/memcheck/PRESUBMIT.py
+/tools/valgrind-libyuv/memcheck/suppressions.txt
+/tools/valgrind-libyuv/memcheck/suppressions_mac.txt
+/tools/valgrind-libyuv/memcheck/suppressions_win32.txt
+/tools/valgrind-libyuv/tsan/OWNERS
+/tools/valgrind-libyuv/tsan/PRESUBMIT.py
+/tools/valgrind-libyuv/tsan/suppressions.txt
+/tools/valgrind-libyuv/tsan/suppressions_mac.txt
+/tools/valgrind-libyuv/tsan/suppressions_win32.txt
 /tools/vim
 /tools/win
 
diff --git a/README.chromium b/README.chromium
index b69caf2e2..8b734be85 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1573
+Version: 1574
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 973311114..cc5d3356e 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1573
+#define LIBYUV_VERSION 1574
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/libyuv.gyp b/libyuv.gyp
index 3909a9738..44dec09ee 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -42,7 +42,7 @@
       # Change type to 'shared_library' to build .so or .dll files.
       'type': 'static_library',
       'variables': {
- #       'optimize': 'max',  # enable O2 and ltcg.
+        'optimize': 'max',  # enable O2 and ltcg.
       },
       # Allows libyuv.a redistributable library without external dependencies.
       'standalone_static_library': 1,
diff --git a/libyuv_test.gyp b/libyuv_test.gyp
index 003710667..0b1c825aa 100644
--- a/libyuv_test.gyp
+++ b/libyuv_test.gyp
@@ -27,14 +27,6 @@
       'export_dependent_settings': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
-      'defines': [
-        # Enable the following 3 macros to turn off assembly for specified CPU.
-        # 'LIBYUV_DISABLE_X86',
-        # 'LIBYUV_DISABLE_NEON',
-        # 'LIBYUV_DISABLE_MIPS',
-        # Enable the following macro to build libyuv as a shared library (dll).
-        # 'LIBYUV_USING_SHARED_LIBRARY',
-      ],
       'sources': [
         # headers
         'unit_test/unit_test.h',
@@ -98,10 +90,24 @@
           'defines': [
             'LIBYUV_NEON'
           ],
-       }],
+        }],
+        # MemorySanitizer does not support assembly code yet.
+        # http://crbug.com/344505
+        [ 'msan == 1', {
+          'defines': [
+            'LIBYUV_DISABLE_X86',
+          ],
+        }],
       ], # conditions
+      'defines': [
+        # Enable the following 3 macros to turn off assembly for specified CPU.
+        # 'LIBYUV_DISABLE_X86',
+        # 'LIBYUV_DISABLE_NEON',
+        # 'LIBYUV_DISABLE_MIPS',
+        # Enable the following macro to build libyuv as a shared library (dll).
+        # 'LIBYUV_USING_SHARED_LIBRARY',
+      ],
     },
-
     {
       'target_name': 'compare',
       'type': 'executable',