summaryrefslogtreecommitdiffstats
path: root/device/battery/battery.gyp
diff options
context:
space:
mode:
authorleviw <leviw@chromium.org>2014-10-27 11:56:07 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-27 18:57:00 +0000
commit86b6faceb71f9b67b2797fc4782cba4a04855d78 (patch)
treeb572a2c6793df51c50e02267d070ba52ceaa321b /device/battery/battery.gyp
parentd311de611b373057dd30b848528fb20f12fde618 (diff)
downloadchromium_src-86b6faceb71f9b67b2797fc4782cba4a04855d78.zip
chromium_src-86b6faceb71f9b67b2797fc4782cba4a04855d78.tar.gz
chromium_src-86b6faceb71f9b67b2797fc4782cba4a04855d78.tar.bz2
Revert of Replace Chrome IPC with Mojo IPC for querying BatteryStatus service (patchset #23 id:570001 of https://codereview.chromium.org/592153002/)
Reason for revert: Broke battery-status LayoutTests: http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=battery-status Original issue's description: > Replace Chrome IPC with Mojo IPC for querying BatteryStatus service > > This is based on patch set 26 from Darin's https://codereview.chromium.org/457933002/ . > > BUG=420623 > > Committed: https://crrev.com/9e6d2387b6d9b28ab6defe7f5feb715a5abbc242 > Cr-Commit-Position: refs/heads/master@{#301380} TBR=rockot@chromium.org,timvolodine@chromium.org,jam@chromium.org,viettrungluu@chromium.org,jln@chromium.org,tsepez@chromium.org,ppi@chromium.org NOTREECHECKS=true NOTRY=true BUG=420623 Review URL: https://codereview.chromium.org/676953005 Cr-Commit-Position: refs/heads/master@{#301402}
Diffstat (limited to 'device/battery/battery.gyp')
-rw-r--r--device/battery/battery.gyp141
1 files changed, 0 insertions, 141 deletions
diff --git a/device/battery/battery.gyp b/device/battery/battery.gyp
deleted file mode 100644
index 5c2a4c6..0000000
--- a/device/battery/battery.gyp
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'variables': {
- 'chromium_code': 1,
- },
- 'targets': [
- {
- # GN version: //device/battery:battery_mojo
- 'target_name': 'device_battery_mojo_bindings',
- 'type': 'static_library',
- 'includes': [
- '../../mojo/public/tools/bindings/mojom_bindings_generator.gypi',
- ],
- 'sources': [
- 'battery_monitor.mojom',
- 'battery_status.mojom',
- ],
- },
- {
- # GN version: //device/battery
- 'target_name': 'device_battery',
- 'type': '<(component)',
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../../mojo/edk/mojo_edk.gyp:mojo_system_impl',
- '../../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
- 'device_battery_mojo_bindings',
- ],
- 'defines': [
- 'DEVICE_BATTERY_IMPLEMENTATION',
- ],
- 'sources': [
- 'android/battery_jni_registrar.cc',
- 'android/battery_jni_registrar.h',
- 'battery_monitor_impl.cc',
- 'battery_monitor_impl.h',
- 'battery_status_manager_android.cc',
- 'battery_status_manager_android.h',
- 'battery_status_manager_chromeos.cc',
- 'battery_status_manager_default.cc',
- 'battery_status_manager_linux.cc',
- 'battery_status_manager_linux.h',
- 'battery_status_manager_mac.cc',
- 'battery_status_manager_win.cc',
- 'battery_status_manager_win.h',
- 'battery_status_manager.h',
- 'battery_status_service.cc',
- 'battery_status_service.h',
- ],
- 'conditions': [
- ['OS == "android"', {
- 'dependencies': [
- 'device_battery_jni_headers',
- ],
- 'sources!': [
- 'battery_status_manager_default.cc',
- ],
- }],
- ['chromeos==1', {
- 'dependencies': [
- '../../build/linux/system.gyp:dbus',
- '../../chromeos/chromeos.gyp:power_manager_proto',
- ],
- 'sources!': [
- 'battery_status_manager_default.cc',
- 'battery_status_manager_linux.cc',
- ],
- }],
- ['OS == "linux" and use_dbus==1', {
- 'sources!': [
- 'battery_status_manager_default.cc',
- ],
- 'dependencies': [
- '../../build/linux/system.gyp:dbus',
- '../../dbus/dbus.gyp:dbus',
- ],
- }, { # OS != "linux" or use_dbus==0
- 'sources!': [
- 'battery_status_manager_linux.cc',
- ],
- }],
- ['OS == "mac"', {
- 'sources!': [
- 'battery_status_manager_default.cc',
- ],
- }],
- ['OS == "win"', {
- 'sources!': [
- 'battery_status_manager_default.cc',
- ],
- }],
- ],
- },
- ],
- 'conditions': [
- ['OS == "android"', {
- 'targets': [
- {
- 'target_name': 'device_battery_jni_headers',
- 'type': 'none',
- 'sources': [
- 'android/java/src/org/chromium/device/battery/BatteryStatusManager.java',
- ],
- 'variables': {
- 'jni_gen_package': 'device_battery',
- },
- 'includes': [ '../../build/jni_generator.gypi' ],
- },
- {
- 'target_name': 'device_battery_java',
- 'type': 'none',
- 'dependencies': [
- '../../base/base.gyp:base',
- ],
- 'variables': {
- 'java_in_dir': '../../device/battery/android/java',
- },
- 'includes': [ '../../build/java.gypi' ],
- },
- {
- 'target_name': 'device_battery_javatests',
- 'type': 'none',
- 'variables': {
- 'java_in_dir': '../../device/battery/android/javatests',
- },
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../base/base.gyp:base_java_test_support',
- 'device_battery_java',
- ],
- 'includes': [ '../../build/java.gypi' ],
- },
- ],
- }],
- ],
-}