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

Unified Diff: content/content_unittests.isolate

Issue 681123003: Merge 663413002 to M39: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2171
Patch Set: Created 6 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
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/media/media_stream_audio_processor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_unittests.isolate
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index 7f4f9c43326240f92dc105c72977b47ad0e34de0..87a4ee9a297698b0149bdc8827762864635d500b 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -56,6 +56,13 @@
],
},
}],
+ ['OS=="linux" and libpeer_target_type=="loadable_module"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/lib/libpeerconnection.so',
+ ],
+ },
+ }],
['OS=="mac"', {
'variables': {
'command': [
@@ -91,6 +98,13 @@
],
},
}],
+ ['OS=="win" and libpeer_target_type=="loadable_module"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/libpeerconnection.dll',
+ ],
+ },
+ }],
],
'includes': [
'../base/base.isolate',
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/media/media_stream_audio_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698