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

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: Rebase /w master and corrected comment about build flag Created 5 years 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
« no previous file with comments | « BUILD.gn ('k') | build/gn_migration.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 48e4482b858c77c1f717c4f9747d59b630747a3e..63e71785f4eca971a6c155b13d463575c8ca51b1 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',
@@ -286,6 +289,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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698