From e74086bfe3165ddc8616c3ceb5d2dc50c4db1d82 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Thu, 14 Jul 2016 12:14:22 -0700 Subject: [PATCH] Remove DISABLE_X86 from build.gn Fix for duplicate define ../../third_party/libyuv/include/libyuv/scale_row.h:29:9: error: 'LIBYUV_DISABLE_X86' macro redefined [-Werror,-Wmacro-redefined] ^ GYP version relys on headers disabling the optimization. This CL does the same for BUILD.gn TBR=kjellander@chromium.org BUG=libyuv:625 Review URL: https://codereview.chromium.org/2149823003 . --- BUILD.gn | 6 ------ README.chromium | 2 +- include/libyuv/version.h | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 3f935f5cb..6f7ac02d5 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -87,12 +87,6 @@ source_set("libyuv") { defines += [ "HAVE_JPEG" ] } - if (is_msan) { - # MemorySanitizer does not support assembly code yet. - # http://crbug.com/344505 - defines += [ "LIBYUV_DISABLE_X86" ] - } - deps = [ "//third_party:jpeg", ] diff --git a/README.chromium b/README.chromium index 74fe1c086..44549f85a 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1607 +Version: 1608 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 8394e08db..2e3957dac 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 1607 +#define LIBYUV_VERSION 1608 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT