diff options
| author | newt <newt@chromium.org> | 2015-08-21 16:44:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-21 23:44:50 +0000 |
| commit | 7d3b3943403f743069c90cbe88ecb00d1545bd42 (patch) | |
| tree | ca3f36c3d57a723d765fd4b46ad2bccbdb24e138 | |
| parent | f5d0ae949f7effed6251506ad6e05c40530e553e (diff) | |
| download | chromium_src-7d3b3943403f743069c90cbe88ecb00d1545bd42.zip chromium_src-7d3b3943403f743069c90cbe88ecb00d1545bd42.tar.gz chromium_src-7d3b3943403f743069c90cbe88ecb00d1545bd42.tar.bz2 | |
Repurpose chrome_shell_uiautomator_tests.
This renames chrome_shell_uiautomator_tests to chrome_uiautomator_tests,
since ChromeShell is going away, and changes the Java package from
org.chromium.chrome.shell.uiautomator to
org.chromium.chrome.uiautomator. These tests aren't actually used
anywhere (will they ever be?), so no further changes are needed.
BUG=510220
Review URL: https://codereview.chromium.org/1310453005
Cr-Commit-Position: refs/heads/master@{#344917}
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | chrome/android/BUILD.gn | 10 | ||||
| -rw-r--r-- | chrome/android/uiautomator_tests/src/org/chromium/chrome/uiautomator/DummyTest.java (renamed from chrome/android/uiautomator_tests/src/org/chromium/chrome/testshell/uiautomator/DummyTest.java) | 2 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/build/all.gyp b/build/all.gyp index 13f8b01..b6f0a02 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -878,7 +878,7 @@ '../chrome/chrome.gyp:chrome_junit_tests', '../chrome/chrome.gyp:chrome_shell_test_apk', '../chrome/chrome.gyp:chrome_sync_shell_test_apk', - '../chrome/chrome.gyp:chrome_shell_uiautomator_tests', + '../chrome/chrome.gyp:chrome_uiautomator_tests', '../chrome/chrome.gyp:chromedriver_webview_shell_apk', '../chrome/chrome.gyp:unit_tests_apk', '../third_party/custom_tabs_client/custom_tabs_client.gyp:custom_tabs_client_example_apk', diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 2baab32..dea6dbe 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -547,8 +547,8 @@ if (false) { } } -# GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests_java -android_library("uiautomator_tests_java") { +# GYP: //chrome/chrome_tests.gypi:chrome_uiautomator_tests_java +android_library("chrome_uiautomator_tests_java") { testonly = true DEPRECATED_java_in_dir = "uiautomator_tests/src" deps = [ @@ -557,11 +557,11 @@ android_library("uiautomator_tests_java") { ] } -# GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests -uiautomator_test("uiautomator_tests") { +# GYP: //chrome/chrome_tests.gypi:chrome_uiautomator_tests +uiautomator_test("chrome_uiautomator_tests") { testonly = true deps = [ - ":uiautomator_tests_java", + ":chrome_uiautomator_tests_java", ] } diff --git a/chrome/android/uiautomator_tests/src/org/chromium/chrome/testshell/uiautomator/DummyTest.java b/chrome/android/uiautomator_tests/src/org/chromium/chrome/uiautomator/DummyTest.java index f71df56..76bb874 100644 --- a/chrome/android/uiautomator_tests/src/org/chromium/chrome/testshell/uiautomator/DummyTest.java +++ b/chrome/android/uiautomator_tests/src/org/chromium/chrome/uiautomator/DummyTest.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.chrome.shell.uiautomator; +package org.chromium.chrome.uiautomator; import com.android.uiautomator.testrunner.UiAutomatorTestCase; diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index b1116e7..8e38fd7 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -3070,7 +3070,7 @@ }, { # GN: //chrome/android:uiautomator_tests_java - 'target_name': 'chrome_shell_uiautomator_tests_java', + 'target_name': 'chrome_uiautomator_tests_java', 'type': 'none', 'variables': { 'java_in_dir': 'android/uiautomator_tests', @@ -3083,10 +3083,10 @@ }, { # GN: //chrome/android:uiautomator_tests - 'target_name': 'chrome_shell_uiautomator_tests', + 'target_name': 'chrome_uiautomator_tests', 'type': 'none', 'dependencies': [ - 'chrome_shell_uiautomator_tests_java', + 'chrome_uiautomator_tests_java', ], 'includes': [ '../build/uiautomator_test.gypi' ], }, |