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

Unified Diff: build/all.gyp

Issue 1446453004: Adding third_party/openh264 build files for encoding (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed brettw comments, (use_openh264 = true again for trybots) Created 5 years, 1 month 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 176e85589db0163c1d505db2a375348474b10704..c2da22638d1ebc399b9ce6b83c3ae7b7d6f46f7e 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -10,6 +10,9 @@
# For Android-specific targets.
'android_app_targets%': [],
},
+ 'includes': [
+ '../third_party/openh264/openh264_args.gypi',
+ ],
'targets': [
{
'target_name': 'All',
@@ -30,6 +33,7 @@
'../testing/gtest.gyp:*',
'../third_party/icu/icu.gyp:*',
'../third_party/libxml/libxml.gyp:*',
+ '../third_party/openh264/testing/openh264_unittests.gyp:*',
'../third_party/sqlite/sqlite.gyp:*',
'../third_party/zlib/zlib.gyp:*',
'../ui/accessibility/accessibility.gyp:*',
@@ -287,6 +291,11 @@
'../envoy/envoy.gyp:*',
],
}],
+ ['use_openh264==1', {
+ 'dependencies': [
+ '../third_party/openh264/openh264.gyp:*',
+ ],
+ }],
],
}, # target_name: All
{
« no previous file with comments | « BUILD.gn ('k') | build/gn_migration.gypi » ('j') | third_party/openh264/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698