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

Side by Side Diff: trunk/src/content/content_tests.gypi

Issue 38753003: Revert 229632 "Set is_test_apk=1 for content_browsertests_apk." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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 | 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) 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 'dependencies': [ 10 'dependencies': [
(...skipping 1313 matching lines...) Expand 10 before | Expand all | Expand 10 after
1324 'content_java_test_support', 1324 'content_java_test_support',
1325 'content_shell_java', 1325 'content_shell_java',
1326 ], 1326 ],
1327 'variables': { 1327 'variables': {
1328 'apk_name': 'content_browsertests', 1328 'apk_name': 'content_browsertests',
1329 'java_in_dir': 'shell/android/browsertests_apk', 1329 'java_in_dir': 'shell/android/browsertests_apk',
1330 'resource_dir': 'shell/android/browsertests_apk/res', 1330 'resource_dir': 'shell/android/browsertests_apk/res',
1331 'native_lib_target': 'libcontent_browsertests', 1331 'native_lib_target': 'libcontent_browsertests',
1332 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 1332 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
1333 'asset_location': '<(ant_build_out)/content_shell/assets', 1333 'asset_location': '<(ant_build_out)/content_shell/assets',
1334 'is_test_apk': 1,
1335 }, 1334 },
1336 'includes': [ '../build/java_apk.gypi' ], 1335 'includes': [ '../build/java_apk.gypi' ],
1337 }, 1336 },
1338 { 1337 {
1339 'target_name': 'content_linker_test_apk', 1338 'target_name': 'content_linker_test_apk',
1340 'type': 'none', 1339 'type': 'none',
1341 'dependencies': [ 1340 'dependencies': [
1342 'content_android_linker_test', 1341 'content_android_linker_test',
1343 'content.gyp:content_java', 1342 'content.gyp:content_java',
1344 'content_shell_java', 1343 'content_shell_java',
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
1598 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1597 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1599 }, 1598 },
1600 ], 1599 ],
1601 }], 1600 }],
1602 ], 1601 ],
1603 }, 1602 },
1604 ], 1603 ],
1605 }], 1604 }],
1606 ], 1605 ],
1607 } 1606 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698