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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 487223003: Remove package_name from java_apk.gypi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « build/java_apk.gypi ('k') | sync/sync_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'includes': [ 5 'includes': [
6 'js_unittest_vars.gypi', 6 'js_unittest_vars.gypi',
7 ], 7 ],
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'interactive_ui_tests', 10 'target_name': 'interactive_ui_tests',
(...skipping 2827 matching lines...) Expand 10 before | Expand all | Expand 10 after
2838 'java_in_dir': 'android/sync_shell/javatests', 2838 'java_in_dir': 'android/sync_shell/javatests',
2839 'additional_src_dirs': [ 'android/shell/javatests', ], 2839 'additional_src_dirs': [ 'android/shell/javatests', ],
2840 'is_test_apk': 1, 2840 'is_test_apk': 1,
2841 }, 2841 },
2842 'includes': [ '../build/java_apk.gypi' ], 2842 'includes': [ '../build/java_apk.gypi' ],
2843 }, 2843 },
2844 { 2844 {
2845 'target_name': 'chrome_java_test_support', 2845 'target_name': 'chrome_java_test_support',
2846 'type': 'none', 2846 'type': 'none',
2847 'variables': { 2847 'variables': {
2848 'package_name': 'chrome_java_test_support',
2849 'java_in_dir': '../chrome/test/android/javatests', 2848 'java_in_dir': '../chrome/test/android/javatests',
2850 }, 2849 },
2851 'dependencies': [ 2850 'dependencies': [
2852 'chrome_java', 2851 'chrome_java',
2853 '../content/content_shell_and_tests.gyp:content_java_test_support', 2852 '../content/content_shell_and_tests.gyp:content_java_test_support',
2854 '../sync/sync.gyp:sync_java', 2853 '../sync/sync.gyp:sync_java',
2855 '../sync/sync.gyp:sync_java_test_support', 2854 '../sync/sync.gyp:sync_java_test_support',
2856 ], 2855 ],
2857 'includes': [ '../build/java.gypi' ], 2856 'includes': [ '../build/java.gypi' ],
2858 }, 2857 },
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
3043 ['enable_webrtc==1', { 3042 ['enable_webrtc==1', {
3044 'dependencies': [ 3043 'dependencies': [
3045 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 3044 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
3046 ] 3045 ]
3047 }], 3046 }],
3048 ], 3047 ],
3049 }] 3048 }]
3050 }], 3049 }],
3051 ], # 'conditions' 3050 ], # 'conditions'
3052 } 3051 }
OLDNEW
« no previous file with comments | « build/java_apk.gypi ('k') | sync/sync_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698