Commit b5d9935c authored by Ke He's avatar Ke He Committed by Commit Bot

Move geolocation junit_tests from //device to //services.

This is one step of "moving //device/geolocation into //services".

BUG=800659

Change-Id: I40f3c1f1b534027132e9eeb17ac5671cad398731
Reviewed-on: https://chromium-review.googlesource.com/1100680Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Commit-Queue: Ke He <ke.he@intel.com>
Cr-Commit-Position: refs/heads/master@{#567524}
parent 7ffd899b
...@@ -363,10 +363,7 @@ if (is_android) { ...@@ -363,10 +363,7 @@ if (is_android) {
} }
junit_binary("device_junit_tests") { junit_binary("device_junit_tests") {
java_files = [ java_files = [ "gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java" ]
"gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java",
"geolocation/android/junit/src/org/chromium/device/geolocation/LocationProviderTest.java",
]
deps = [ deps = [
"$google_play_services_package:google_play_services_base_java", "$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_java", "$google_play_services_package:google_play_services_basement_java",
...@@ -375,8 +372,6 @@ if (is_android) { ...@@ -375,8 +372,6 @@ if (is_android) {
"//base:base_java_test_support", "//base:base_java_test_support",
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//device/gamepad:java", "//device/gamepad:java",
"//device/geolocation:geolocation_java",
"//device/geolocation/public/java:geolocation_java_test_support",
"//mojo/public/java:bindings_java", "//mojo/public/java:bindings_java",
"//third_party/android_tools:android_support_annotations_java", "//third_party/android_tools:android_support_annotations_java",
] ]
......
...@@ -149,6 +149,7 @@ if (is_android) { ...@@ -149,6 +149,7 @@ if (is_android) {
java_files = [ java_files = [
"device/generic_sensor/android/junit/src/org/chromium/device/sensors/PlatformSensorAndProviderTest.java", "device/generic_sensor/android/junit/src/org/chromium/device/sensors/PlatformSensorAndProviderTest.java",
"device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java", "device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java",
"device/geolocation/android/junit/src/org/chromium/device/geolocation/LocationProviderTest.java",
"shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java", "shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java",
] ]
deps = [ deps = [
...@@ -159,6 +160,8 @@ if (is_android) { ...@@ -159,6 +160,8 @@ if (is_android) {
"//base:base_java", "//base:base_java",
"//base:base_java_test_support", "//base:base_java_test_support",
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//device/geolocation:geolocation_java",
"//device/geolocation/public/java:geolocation_java_test_support",
"//mojo/public/java:bindings_java", "//mojo/public/java:bindings_java",
"//mojo/public/java:system_java", "//mojo/public/java:system_java",
"//services/device/generic_sensor:java", "//services/device/generic_sensor:java",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment