diff options
Diffstat (limited to 'tools/cr')
| -rw-r--r-- | tools/cr/cr/base/android.py | 2 | ||||
| -rw-r--r-- | tools/cr/cr/targets/chrome_shell.py | 27 |
2 files changed, 1 insertions, 28 deletions
diff --git a/tools/cr/cr/base/android.py b/tools/cr/cr/base/android.py index 13e4431..6f8a8b7 100644 --- a/tools/cr/cr/base/android.py +++ b/tools/cr/cr/base/android.py @@ -37,7 +37,7 @@ class AndroidPlatform(cr.Platform): CR_TEST_RUNNER=os.path.join( '{CR_SRC}', 'build', 'android', 'test_runner.py'), CR_ADB_GDB=os.path.join('{CR_SRC}', 'build', 'android', 'adb_gdb'), - CR_DEFAULT_TARGET='chrome_shell', + CR_DEFAULT_TARGET='chrome_public', GYP_DEF_OS='android', GN_ARG_os='"android"' ) diff --git a/tools/cr/cr/targets/chrome_shell.py b/tools/cr/cr/targets/chrome_shell.py deleted file mode 100644 index 47685b91..0000000 --- a/tools/cr/cr/targets/chrome_shell.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -"""Module for the chrome_shell targets.""" - -import cr - - -class ChromeShellTarget(cr.NamedTarget): - NAME = 'chrome_shell' - CONFIG = cr.Config.From( - CR_RUN_ARGUMENTS=cr.Config.Optional('-d "{CR_URL!e}"'), - CR_TARGET_NAME='ChromeShell', - CR_PACKAGE='org.chromium.chrome.shell', - CR_ACTIVITY='.ChromeShellActivity', - ) - - -class ChromeShellTestTarget(cr.NamedTarget): - NAME = 'chrome_shell_test' - CONFIG = cr.Config.From( - CR_TARGET_NAME='ChromeShellTest', - CR_TEST_TYPE=cr.Target.INSTRUMENTATION_TEST, - CR_RUN_DEPENDENCIES=[ChromeShellTarget.NAME], - ) - |