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

Side by Side Diff: content/content_tests.gypi

Issue 22865003: Add dependency on android_tools in java_apk.gypi for all test apks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move the dependency to java_apk.gypi. Created 7 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 | « chrome/chrome_tests.gypi ('k') | tools/android/android_tools.gyp » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 { 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 1220 matching lines...) Expand 10 before | Expand all | Expand 10 after
1231 'content_java', 1231 'content_java',
1232 'content_java_test_support', 1232 'content_java_test_support',
1233 'content_shell_apk_java', 1233 'content_shell_apk_java',
1234 '../base/base.gyp:base_java', 1234 '../base/base.gyp:base_java',
1235 '../base/base.gyp:base_javatests', 1235 '../base/base.gyp:base_javatests',
1236 '../base/base.gyp:base_java_test_support', 1236 '../base/base.gyp:base_java_test_support',
1237 '../media/media.gyp:media_java', 1237 '../media/media.gyp:media_java',
1238 '../media/media.gyp:media_test_support', 1238 '../media/media.gyp:media_test_support',
1239 '../net/net.gyp:net_java', 1239 '../net/net.gyp:net_java',
1240 '../net/net.gyp:net_javatests', 1240 '../net/net.gyp:net_javatests',
1241 '../tools/android/forwarder2/forwarder.gyp:forwarder2',
1242 ], 1241 ],
1243 'variables': { 1242 'variables': {
1244 'apk_name': 'ContentShellTest', 1243 'apk_name': 'ContentShellTest',
1245 'java_in_dir': 'shell/android/javatests', 1244 'java_in_dir': 'shell/android/javatests',
1246 'resource_dir': 'shell/android/shell_apk/res', 1245 'resource_dir': 'shell/android/shell_apk/res',
1247 'additional_src_dirs': ['public/android/javatests/',], 1246 'additional_src_dirs': ['public/android/javatests/',],
1248 'is_test_apk': 1, 1247 'is_test_apk': 1,
1249 }, 1248 },
1250 'includes': [ '../build/java_apk.gypi' ], 1249 'includes': [ '../build/java_apk.gypi' ],
1251 }, 1250 },
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1389 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1391 }, 1390 },
1392 ], 1391 ],
1393 }], 1392 }],
1394 ], 1393 ],
1395 }, 1394 },
1396 ], 1395 ],
1397 }], 1396 }],
1398 ], 1397 ],
1399 } 1398 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | tools/android/android_tools.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698