diff options
| author | newt <newt@chromium.org> | 2015-09-02 12:41:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-02 19:41:57 +0000 |
| commit | 989d386cbe93ec261df6bd8a87fef5532dea1669 (patch) | |
| tree | 3122966244451b86e8125f1e5cef472d4ea0e731 | |
| parent | be1ccf63461b881b8542975e086a0e682600e2b2 (diff) | |
| download | chromium_src-989d386cbe93ec261df6bd8a87fef5532dea1669.zip chromium_src-989d386cbe93ec261df6bd8a87fef5532dea1669.tar.gz chromium_src-989d386cbe93ec261df6bd8a87fef5532dea1669.tar.bz2 | |
Remove all traces of ChromeShell from src/build.
ChromeShell is about to be deleted. Remove all knowledge of ChromeShell
from build.
BUG=510220
Review URL: https://codereview.chromium.org/1317453005
Cr-Commit-Position: refs/heads/master@{#346997}
| -rw-r--r-- | BUILD.gn | 1 | ||||
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/android/pylib/constants/__init__.py | 6 | ||||
| -rw-r--r-- | build/android/pylib/instrumentation/setup.py | 1 | ||||
| -rw-r--r-- | build/android/pylib/results/report_results.py | 1 | ||||
| -rw-r--r-- | build/gn_migration.gypi | 1 |
6 files changed, 0 insertions, 12 deletions
@@ -220,7 +220,6 @@ group("both_gn_and_gyp") { "//build/android/rezip", "//chrome/android:chrome_public_apk", "//chrome/android:chrome_public_test_apk", - "//chrome/android:chrome_shell_apk", "//chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk", "//third_party/errorprone:chromium_errorprone", "//tools/imagediff($host_toolchain)", diff --git a/build/all.gyp b/build/all.gyp index 95d816f..953ec13d 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -88,7 +88,6 @@ '../android_webview/android_webview_shell.gyp:android_webview_shell_apk', '../chrome/android/chrome_apk.gyp:chrome_public_apk', '../chrome/android/chrome_apk.gyp:chrome_sync_shell_apk', - '../chrome/chrome.gyp:chrome_shell_apk', '../remoting/remoting.gyp:remoting_apk', ], }], @@ -877,7 +876,6 @@ '../chrome/android/chrome_apk.gyp:chrome_public_test_apk', '../chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk', '../chrome/chrome.gyp:chrome_junit_tests', - '../chrome/chrome.gyp:chrome_shell_test_apk', '../chrome/chrome.gyp:chrome_uiautomator_tests', '../chrome/chrome.gyp:chromedriver_webview_shell_apk', '../chrome/chrome.gyp:unit_tests_apk', diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py index 8f875fe..d6f68ee 100644 --- a/build/android/pylib/constants/__init__.py +++ b/build/android/pylib/constants/__init__.py @@ -93,12 +93,6 @@ PACKAGE_INFO = { '/data/local/tmp/content-shell-command-line', None, 'org.chromium.content_shell_apk.tests'), - 'chrome_shell': PackageInfo( - 'org.chromium.chrome.shell', - 'org.chromium.chrome.shell.ChromeShellActivity', - '/data/local/tmp/chrome-shell-command-line', - 'chrome_shell_devtools_remote', - 'org.chromium.chrome.shell.tests'), 'android_webview_shell': PackageInfo( 'org.chromium.android_webview.shell', 'org.chromium.android_webview.shell.AwShellActivity', diff --git a/build/android/pylib/instrumentation/setup.py b/build/android/pylib/instrumentation/setup.py index 698b609..aacb6b3 100644 --- a/build/android/pylib/instrumentation/setup.py +++ b/build/android/pylib/instrumentation/setup.py @@ -19,7 +19,6 @@ DEVICE_DATA_DIR = 'chrome/test/data' ISOLATE_FILE_PATHS = { 'AndroidWebViewTest': 'android_webview/android_webview_test_apk.isolate', - 'ChromeShellTest': 'chrome/chrome_shell_test_apk.isolate', 'ContentShellTest': 'content/content_shell_test_apk.isolate', } diff --git a/build/android/pylib/results/report_results.py b/build/android/pylib/results/report_results.py index 4fc6aa0..371ab96 100644 --- a/build/android/pylib/results/report_results.py +++ b/build/android/pylib/results/report_results.py @@ -44,7 +44,6 @@ def _LogToFlakinessDashboard(results, test_type, test_package, if flakiness_server == constants.UPSTREAM_FLAKINESS_SERVER: assert test_package in ['ContentShellTest', 'ChromePublicTest', - 'ChromeShellTest', 'ChromeSyncShellTest', 'AndroidWebViewTest'] dashboard_test_type = ('%s_instrumentation_tests' % diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index 2cfa1fb..b19f384 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -291,7 +291,6 @@ '../build/android/rezip.gyp:rezip_apk_jar', '../chrome/chrome.gyp:chrome_public_apk', '../chrome/chrome.gyp:chrome_public_test_apk', - '../chrome/chrome.gyp:chrome_shell_apk', '../chrome/chrome.gyp:chromedriver_webview_shell_apk', #"//clank" TODO(GYP) - conditional somehow? '../tools/imagediff/image_diff.gyp:image_diff#host', |