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

Side by Side Diff: webrtc/webrtc_examples.gyp

Issue 2347403002: Merge AppRTCDemoJUnitTest into android_junit_tests target (Closed)
Patch Set: Updated examples/androidjunit/README and removed old GYP target. Created 4 years, 3 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 | « webrtc/examples/androidjunit/README ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The WebRTC Project Authors. All rights reserved. 1 # Copyright (c) 2012 The WebRTC Project Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 { 8 {
9 'conditions': [ 9 'conditions': [
10 ['OS=="linux" or OS=="win"', { 10 ['OS=="linux" or OS=="win"', {
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 'java_in_dir': 'examples/androidtests', 452 'java_in_dir': 'examples/androidtests',
453 'is_test_apk': 1, 453 'is_test_apk': 1,
454 'test_type': 'instrumentation', 454 'test_type': 'instrumentation',
455 'test_runner_path': '<(DEPTH)/webrtc/build/android/test_runner.py', 455 'test_runner_path': '<(DEPTH)/webrtc/build/android/test_runner.py',
456 }, 456 },
457 'includes': [ 457 'includes': [
458 '../build/java_apk.gypi', 458 '../build/java_apk.gypi',
459 '../build/android/test_runner.gypi', 459 '../build/android/test_runner.gypi',
460 ], 460 ],
461 }, 461 },
462
463 {
464 'target_name': 'AppRTCDemoJUnitTest',
465 'type': 'none',
466 'dependencies': [
467 'AppRTCDemo_apk',
468 '<(DEPTH)/base/base.gyp:base_java',
469 '<(DEPTH)/base/base.gyp:base_java_test_support',
470 '<(DEPTH)/base/base.gyp:base_junit_test_support',
471 ],
472 'variables': {
473 'main_class': 'org.chromium.testing.local.JunitTestMain',
474 'src_paths': [
475 'examples/androidjunit/',
476 ],
477 'test_type': 'junit',
478 'wrapper_script_name': 'helper/<(_target_name)',
479 },
480 'includes': [
481 '../build/host_jar.gypi',
482 '../build/android/test_runner.gypi',
483 ],
484 },
485 ], # targets 462 ], # targets
486 }], # OS=="android" 463 }], # OS=="android"
487 ], 464 ],
488 } 465 }
OLDNEW
« no previous file with comments | « webrtc/examples/androidjunit/README ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698