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

Side by Side Diff: content/content_shell_test_apk.isolate

Issue 1920753002: Make content_shell_test fit isolate naming convention. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also update bb_device_steps.py. Created 4 years, 8 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 | « build/android/buildbot/bb_device_steps.py ('k') | content/content_shell_test_apk_run.isolate » ('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) 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 'conditions': [ 5 'includes': [
6 ['OS=="android"', { 6 '../build/android/android.isolate',
7 'variables': { 7 'content_shell_test_data.isolate',
8 'files': [
9 '<(DEPTH)/content/test/data/android/',
10 '<(DEPTH)/content/test/data/media/session/',
11 '<(DEPTH)/net/data/ssl/certificates/crit-codeSigning-chain.pem',
12 '<(DEPTH)/net/data/ssl/certificates/eku-test-root.pem',
13 '<(DEPTH)/net/data/ssl/certificates/invalid_key_usage_cert.der',
14 '<(DEPTH)/net/data/ssl/certificates/non-crit-codeSigning-chain.pem',
15 '<(DEPTH)/net/data/ssl/certificates/ok_cert.pem',
16 '<(DEPTH)/net/data/ssl/certificates/root_ca_cert.pem',
17 ],
18 },
19 }],
20 ], 8 ],
9 'variables': {
10 'command': [
11 '<(PRODUCT_DIR)/bin/run_content_shell_test_apk',
12 '--enable-platform-mode',
13 '-e', 'local',
14 '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
15 ],
16 'files': [
17 '../third_party/proguard/',
18 '<(PRODUCT_DIR)/apks/ContentShell.apk',
19 '<(PRODUCT_DIR)/apks/ContentShellTest.apk',
20 '<(PRODUCT_DIR)/bin/run_content_shell_test_apk',
21 '<(PRODUCT_DIR)/test.lib.java/ContentShellTest.jar',
22 'content_shell_test_data.isolate',
23 ]
24 },
21 } 25 }
OLDNEW
« no previous file with comments | « build/android/buildbot/bb_device_steps.py ('k') | content/content_shell_test_apk_run.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698