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

Side by Side Diff: content/content_tests.gypi

Issue 10830287: Adding AndroidProxySelectorTest to ContentShell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed empty line Created 8 years, 4 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 | « no previous file | content/shell/android/javatests/content_shell_test_apk.xml » ('j') | net/net.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 'java_in_dir': '../content/public/android/javatests', 791 'java_in_dir': '../content/public/android/javatests',
792 }, 792 },
793 'includes': [ '../build/java.gypi' ], 793 'includes': [ '../build/java.gypi' ],
794 }, 794 },
795 { 795 {
796 'target_name': 'content_shell_test_apk', 796 'target_name': 'content_shell_test_apk',
797 'type': 'none', 797 'type': 'none',
798 'dependencies': [ 798 'dependencies': [
799 'content_shell_apk', 799 'content_shell_apk',
800 'content_javatests', 800 'content_javatests',
801 '../net/net.gyp:net_javatests',
801 '../tools/android/forwarder/forwarder.gyp:forwarder', 802 '../tools/android/forwarder/forwarder.gyp:forwarder',
802 ], 803 ],
803 'actions': [ 804 'actions': [
804 { 805 {
805 'action_name': 'copy_base_javatests_jar', 806 'action_name': 'copy_base_javatests_jar',
806 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base_javatests.jar'], 807 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base_javatests.jar'],
807 'outputs': ['<(PRODUCT_DIR)/content_shell_test/java/libs/chromium_ base_javatests.jar'], 808 'outputs': ['<(PRODUCT_DIR)/content_shell_test/java/libs/chromium_ base_javatests.jar'],
808 'action': ['cp', '<@(_inputs)', '<@(_outputs)'], 809 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
809 }, 810 },
810 { 811 {
812 'action_name': 'copy_net_javatests_jar',
813 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_net_javatests.jar'],
814 'outputs': ['<(PRODUCT_DIR)/content_shell_test/java/libs/chromium_ net_javatests.jar'],
815 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
816 },
817 {
811 'action_name': 'copy_content_javatests_jar', 818 'action_name': 'copy_content_javatests_jar',
812 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content_javatests.jar '], 819 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content_javatests.jar '],
813 'outputs': ['<(PRODUCT_DIR)/content_shell_test/java/libs/chromium_ content_javatests.jar'], 820 'outputs': ['<(PRODUCT_DIR)/content_shell_test/java/libs/chromium_ content_javatests.jar'],
814 'action': ['cp', '<@(_inputs)', '<@(_outputs)'], 821 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
815 }, 822 },
816 { 823 {
817 'action_name': 'content_shell_test_generate_apk', 824 'action_name': 'content_shell_test_generate_apk',
818 'inputs': [ 825 'inputs': [
819 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml', 826 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml',
820 '<(DEPTH)/content/shell/android/javatests/AndroidManifest.xml', 827 '<(DEPTH)/content/shell/android/javatests/AndroidManifest.xml',
(...skipping 14 matching lines...) Expand all
835 '-buildfile', 842 '-buildfile',
836 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml', 843 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml',
837 ] 844 ]
838 } 845 }
839 ], 846 ],
840 }, 847 },
841 ], 848 ],
842 }], 849 }],
843 ], 850 ],
844 } 851 }
OLDNEW
« no previous file with comments | « no previous file | content/shell/android/javatests/content_shell_test_apk.xml » ('j') | net/net.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698