Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Unified Diff: third_party/instrumented_libraries/pulseaudio.diff

Issue 361473002: Instrumented libraries: improve handling of custom patches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use -i to pass filename to patch Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/instrumented_libraries/pulseaudio.diff
diff --git a/third_party/instrumented_libraries/pulseaudio.diff b/third_party/instrumented_libraries/pulseaudio.diff
deleted file mode 100644
index fc2ca0d297c7832a227138ee7a5d20c986735efc..0000000000000000000000000000000000000000
--- a/third_party/instrumented_libraries/pulseaudio.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -rupN ./src/modules/bluetooth/sbc/sbc_primitives_mmx.h ../pulseaudio-1.1-patched/src/modules/bluetooth/sbc/sbc_primitives_mmx.h
---- ./src/modules/bluetooth/sbc/sbc_primitives_mmx.h 2011-10-20 16:54:16.000000000 +0400
-+++ ../pulseaudio-1.1-patched/src/modules/bluetooth/sbc/sbc_primitives_mmx.h 2014-01-30 16:57:43.113946495 +0400
-@@ -29,8 +29,11 @@
-
- #include "sbc_primitives.h"
-
-+// The inline asm causes errors in clang builds. We don't want inline asm in
-+// instrumented builds anyway.
- #if defined(__GNUC__) && (defined(__i386__) || defined(__amd64__)) && \
-- !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15)
-+ !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15) && \
-+ !defined(__clang__)
-
- #define SBC_BUILD_WITH_MMX_SUPPORT
-
« no previous file with comments | « third_party/instrumented_libraries/patches/zlib1g.diff ('k') | third_party/instrumented_libraries/pulseaudio.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698