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

Unified Diff: extensions/extensions.gyp

Issue 1900233004: [chrome.displaySource] Implement software based H.264 video encoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Check proprietary_codecs Created 4 years, 8 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
« no previous file with comments | « extensions/common/BUILD.gn ('k') | extensions/extensions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/extensions.gyp
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index 3aae4cb258e6b603f96fce52096d3a347125aac4..5c0c93602ec3037b1d8b9e96f69c710f8ab4728c 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -38,7 +38,7 @@
'<@(extensions_common_mojo_sources)',
],
'conditions': [
- ['enable_wifi_display==1', {
+ ['proprietary_codecs==1 and enable_wifi_display==1', {
'sources': [
'<@(extensions_common_mojo_sources_wifi_display)',
],
@@ -186,7 +186,7 @@
'<@(extensions_browser_sources_linux_nonchromeos)',
],
}],
- ['enable_wifi_display == 1', {
+ ['proprietary_codecs==1 and enable_wifi_display == 1', {
'sources': [
'<@(extensions_browser_sources_wifi_display)',
'<(SHARED_INTERMEDIATE_DIR)/extensions/common/mojo/wifi_display_session_service.mojom.cc',
@@ -219,8 +219,9 @@
# Disable c4267 warnings until we fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
'conditions': [
- ['enable_wifi_display==1', {
+ ['proprietary_codecs==1 and enable_wifi_display==1', {
'dependencies': [
+ '../third_party/openh264/openh264.gyp:openh264_encoder',
'../third_party/wds/wds.gyp:libwds',
],
'sources': [
« no previous file with comments | « extensions/common/BUILD.gn ('k') | extensions/extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698