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

Side by Side Diff: talk/libjingle_tests.gyp

Issue 1602443004: Make it possible to run peerconnection_unittests on Android. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix isolate Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « talk/libjingle_peerconnection_unittest.isolate ('k') | talk/peerconnection_unittests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 'VCLinkerTool': { 180 'VCLinkerTool': {
181 'AdditionalDependencies': [ 181 'AdditionalDependencies': [
182 'strmiids.lib', 182 'strmiids.lib',
183 ], 183 ],
184 }, 184 },
185 }, 185 },
186 }], 186 }],
187 ], 187 ],
188 }, # target libjingle_p2p_unittest 188 }, # target libjingle_p2p_unittest
189 { 189 {
190 'target_name': 'libjingle_peerconnection_unittest', 190 'target_name': 'peerconnection_unittests',
191 'type': '<(gtest_target_type)', 191 'type': '<(gtest_target_type)',
192 'dependencies': [ 192 'dependencies': [
193 '<(DEPTH)/testing/gmock.gyp:gmock', 193 '<(DEPTH)/testing/gmock.gyp:gmock',
194 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', 194 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
195 '<(webrtc_root)/common.gyp:webrtc_common', 195 '<(webrtc_root)/common.gyp:webrtc_common',
196 'libjingle.gyp:libjingle', 196 'libjingle.gyp:libjingle',
197 'libjingle.gyp:libjingle_p2p', 197 'libjingle.gyp:libjingle_p2p',
198 'libjingle.gyp:libjingle_peerconnection', 198 'libjingle.gyp:libjingle_peerconnection',
199 'libjingle_unittest_main', 199 'libjingle_unittest_main',
200 ], 200 ],
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 'VCCLCompilerTool': { 253 'VCCLCompilerTool': {
254 'AdditionalOptions': [ 254 'AdditionalOptions': [
255 # Disable warnings failing when compiling with Clang on Windows. 255 # Disable warnings failing when compiling with Clang on Windows.
256 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 256 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
257 '-Wno-unused-function', 257 '-Wno-unused-function',
258 ], 258 ],
259 }, 259 },
260 }, 260 },
261 }], 261 }],
262 ], 262 ],
263 }, # target libjingle_peerconnection_unittest 263 }, # target peerconnection_unittests
264 ], 264 ],
265 'conditions': [ 265 'conditions': [
266 ['OS=="linux"', { 266 ['OS=="linux"', {
267 'variables': { 267 'variables': {
268 'junit_jar': '<(DEPTH)/third_party/junit-jar/junit-4.11.jar', 268 'junit_jar': '<(DEPTH)/third_party/junit-jar/junit-4.11.jar',
269 }, 269 },
270 'targets': [ 270 'targets': [
271 { 271 {
272 'target_name': 'libjingle_peerconnection_test_jar', 272 'target_name': 'libjingle_peerconnection_test_jar',
273 'type': 'none', 273 'type': 'none',
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 'MACOSX_DEPLOYMENT_TARGET' : '10.8', 408 'MACOSX_DEPLOYMENT_TARGET' : '10.8',
409 }, 409 },
410 }], 410 }],
411 ], 411 ],
412 }, # target apprtc_signaling_gunit_test 412 }, # target apprtc_signaling_gunit_test
413 ], 413 ],
414 }], 414 }],
415 ['OS=="android"', { 415 ['OS=="android"', {
416 'targets': [ 416 'targets': [
417 { 417 {
418 'target_name': 'libjingle_peerconnection_unittest_apk_target', 418 'target_name': 'peerconnection_unittests_apk_target',
419 'type': 'none', 419 'type': 'none',
420 'dependencies': [ 420 'dependencies': [
421 '<(DEPTH)/webrtc/build/apk_tests.gyp:libjingle_peerconnection_unitte st_apk', 421 '<(DEPTH)/webrtc/build/apk_tests.gyp:peerconnection_unittests_apk',
422 ], 422 ],
423 }, 423 },
424 ], 424 ],
425 }], 425 }],
426 ['test_isolation_mode != "noop"', { 426 ['test_isolation_mode != "noop"', {
427 'targets': [ 427 'targets': [
428 { 428 {
429 'target_name': 'libjingle_media_unittest_run', 429 'target_name': 'libjingle_media_unittest_run',
430 'type': 'none', 430 'type': 'none',
431 'dependencies': [ 431 'dependencies': [
(...skipping 13 matching lines...) Expand all
445 'libjingle_p2p_unittest', 445 'libjingle_p2p_unittest',
446 ], 446 ],
447 'includes': [ 447 'includes': [
448 'build/isolate.gypi', 448 'build/isolate.gypi',
449 ], 449 ],
450 'sources': [ 450 'sources': [
451 'libjingle_p2p_unittest.isolate', 451 'libjingle_p2p_unittest.isolate',
452 ], 452 ],
453 }, 453 },
454 { 454 {
455 'target_name': 'libjingle_peerconnection_unittest_run', 455 'target_name': 'peerconnection_unittests_run',
456 'type': 'none', 456 'type': 'none',
457 'dependencies': [ 457 'dependencies': [
458 'libjingle_peerconnection_unittest', 458 'peerconnection_unittests',
459 ], 459 ],
460 'includes': [ 460 'includes': [
461 'build/isolate.gypi', 461 'build/isolate.gypi',
462 ], 462 ],
463 'sources': [ 463 'sources': [
464 'libjingle_peerconnection_unittest.isolate', 464 'peerconnection_unittests.isolate',
465 ], 465 ],
466 }, 466 },
467 ], 467 ],
468 }], 468 }],
469 ], 469 ],
470 } 470 }
OLDNEW
« no previous file with comments | « talk/libjingle_peerconnection_unittest.isolate ('k') | talk/peerconnection_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698