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

Unified Diff: build/all.gyp

Issue 1403893007: Adding third_party/openh264/src, build files and unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Misc Created 5 years, 2 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: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index ef9ad981e65e7b4f104fcc1419cc9ebacd4791f3..9145dc6056927d70c99071f12b13930af315abc4 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -30,7 +30,6 @@
'../testing/gtest.gyp:*',
'../third_party/icu/icu.gyp:*',
'../third_party/libxml/libxml.gyp:*',
- '../third_party/openh264/tests/openh264_unittests.gyp:*',
'../third_party/sqlite/sqlite.gyp:*',
'../third_party/zlib/zlib.gyp:*',
'../ui/accessibility/accessibility.gyp:*',
@@ -289,6 +288,11 @@
'../envoy/envoy.gyp:*',
],
}],
+ ['build_openh264==1', {
+ 'dependencies': [
+ '../third_party/openh264/openh264.gyp:*',
+ ],
+ }],
],
}, # target_name: All
{
« no previous file with comments | « DEPS ('k') | build/common.gypi » ('j') | content/browser/media/openh264_unittests.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698