diff options
| author | rockot <rockot@chromium.org> | 2015-11-12 17:33:59 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-13 01:34:47 +0000 |
| commit | 85dce086001825a2faa4e75755a669f5e08a1cad (patch) | |
| tree | 722de1d974f799b3d1ee1ca4c81bb8b0fa75a95d /device/battery | |
| parent | 415b73b1a400a994a86e6f29709aa0271e895dd5 (diff) | |
| download | chromium_src-85dce086001825a2faa4e75755a669f5e08a1cad.zip chromium_src-85dce086001825a2faa4e75755a669f5e08a1cad.tar.gz chromium_src-85dce086001825a2faa4e75755a669f5e08a1cad.tar.bz2 | |
Move third_party/mojo/src/mojo/public to mojo/public
BUG=None
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1410053006
Cr-Commit-Position: refs/heads/master@{#359461}
Diffstat (limited to 'device/battery')
| -rw-r--r-- | device/battery/BUILD.gn | 4 | ||||
| -rw-r--r-- | device/battery/android/BUILD.gn | 4 | ||||
| -rw-r--r-- | device/battery/battery_monitor_impl.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/device/battery/BUILD.gn b/device/battery/BUILD.gn index 6eab813..17cd64d 100644 --- a/device/battery/BUILD.gn +++ b/device/battery/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//build/config/features.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") # On android, BatteryManager mojo service is implemented directly in Java. if (!is_android) { @@ -32,7 +32,7 @@ if (!is_android) { "//base", "//base/third_party/dynamic_annotations", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/edk/system", ] diff --git a/device/battery/android/BUILD.gn b/device/battery/android/BUILD.gn index 503a10c..997c9b4 100644 --- a/device/battery/android/BUILD.gn +++ b/device/battery/android/BUILD.gn @@ -15,8 +15,8 @@ android_library("battery_monitor_android") { deps = [ "//base:base_java", "//device/battery:mojo_bindings_java", + "//mojo/public/java:bindings", + "//mojo/public/java:system", "//third_party/jsr-305:jsr_305_javalib", - "//third_party/mojo/src/mojo/public/java:bindings", - "//third_party/mojo/src/mojo/public/java:system", ] } diff --git a/device/battery/battery_monitor_impl.h b/device/battery/battery_monitor_impl.h index 6bf65f7..8d7a67f 100644 --- a/device/battery/battery_monitor_impl.h +++ b/device/battery/battery_monitor_impl.h @@ -9,7 +9,7 @@ #include "device/battery/battery_export.h" #include "device/battery/battery_monitor.mojom.h" #include "device/battery/battery_status_service.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace device { |