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

Unified Diff: chrome/chrome_tests.gypi

Issue 1314413004: Cast ChromeShell into the fiery pit of Mount Doom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_shell_test_apk.isolate ('k') | tools/android/eclipse/.classpath » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 2cb489e9477171a97c1e971046e2c3946ab629fc..cd0211d0610acf19d9b66ea28cacde3b2ca67911 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3025,33 +3025,6 @@
['OS == "android"', {
'targets': [
{
- # GN: //chrome/android:chrome_shell_test_apk
- 'target_name': 'chrome_shell_test_apk',
- 'type': 'none',
- 'dependencies': [
- 'chrome_java',
- 'chrome_shell_apk_java',
- 'chrome_java_test_support',
- '../base/base.gyp:base',
- '../base/base.gyp:base_java_test_support',
- '../content/content_shell_and_tests.gyp:content_java_test_support',
- '../testing/android/on_device_instrumentation.gyp:broker_java',
- '../testing/android/on_device_instrumentation.gyp:require_driver_apk',
- ],
- 'variables': {
- 'apk_name': 'ChromeShellTest',
- 'java_in_dir': 'android/shell/javatests',
- 'additional_src_dirs': ['android/javatests_shell/src'],
- 'is_test_apk': 1,
- 'test_type': 'instrumentation',
- 'isolate_file': 'chrome_shell_test_apk.isolate',
- },
- 'includes': [
- '../build/java_apk.gypi',
- '../build/android/test_runner.gypi',
- ],
- },
- {
# GN: //chrome/android:chrome_junit_tests
'target_name': 'chrome_junit_tests',
'type': 'none',
« no previous file with comments | « chrome/chrome_shell_test_apk.isolate ('k') | tools/android/eclipse/.classpath » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698