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

Side by Side Diff: device/battery/battery.gyp

Issue 814543006: Move //mojo/{public, edk} underneath //third_party (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « device/battery/android/BUILD.gn ('k') | device/device_tests.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 # GN version: //device/battery:battery_mojo 11 # GN version: //device/battery:battery_mojo
12 'target_name': 'device_battery_mojo_bindings', 12 'target_name': 'device_battery_mojo_bindings',
13 'type': 'static_library', 13 'type': 'static_library',
14 'includes': [ 14 'includes': [
15 '../../mojo/mojom_bindings_generator.gypi', 15 '../../third_party/mojo/mojom_bindings_generator.gypi',
16 ], 16 ],
17 'sources': [ 17 'sources': [
18 'battery_monitor.mojom', 18 'battery_monitor.mojom',
19 'battery_status.mojom', 19 'battery_status.mojom',
20 ], 20 ],
21 }, 21 },
22 { 22 {
23 # This is needed only for a build within Android tree. TODO(ppi): remove 23 # This is needed only for a build within Android tree. TODO(ppi): remove
24 # when Android tree build is deprecated. 24 # when Android tree build is deprecated.
25 'target_name': 'device_battery_mojo_bindings_for_webview', 25 'target_name': 'device_battery_mojo_bindings_for_webview',
(...skipping 23 matching lines...) Expand all
49 'hard_dependency': 1, 49 'hard_dependency': 1,
50 }, 50 },
51 { 51 {
52 # GN version: //device/battery 52 # GN version: //device/battery
53 'target_name': 'device_battery', 53 'target_name': 'device_battery',
54 'type': '<(component)', 54 'type': '<(component)',
55 'dependencies': [ 55 'dependencies': [
56 '../../base/base.gyp:base', 56 '../../base/base.gyp:base',
57 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 57 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
58 '../../mojo/mojo_base.gyp:mojo_environment_chromium', 58 '../../mojo/mojo_base.gyp:mojo_environment_chromium',
59 '../../mojo/mojo_edk.gyp:mojo_system_impl', 59 '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
60 '../../mojo/mojo_public.gyp:mojo_cpp_bindings', 60 '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
61 'device_battery_mojo_bindings', 61 'device_battery_mojo_bindings',
62 ], 62 ],
63 'defines': [ 63 'defines': [
64 'DEVICE_BATTERY_IMPLEMENTATION', 64 'DEVICE_BATTERY_IMPLEMENTATION',
65 ], 65 ],
66 'sources': [ 66 'sources': [
67 'battery_monitor_impl.cc', 67 'battery_monitor_impl.cc',
68 'battery_monitor_impl.h', 68 'battery_monitor_impl.h',
69 'battery_status_manager_chromeos.cc', 69 'battery_status_manager_chromeos.cc',
70 'battery_status_manager_default.cc', 70 'battery_status_manager_default.cc',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 }, 115 },
116 ], 116 ],
117 'conditions': [ 117 'conditions': [
118 ['OS == "android"', { 118 ['OS == "android"', {
119 'targets': [ 119 'targets': [
120 { 120 {
121 'target_name': 'device_battery_java', 121 'target_name': 'device_battery_java',
122 'type': 'none', 122 'type': 'none',
123 'dependencies': [ 123 'dependencies': [
124 '../../base/base.gyp:base', 124 '../../base/base.gyp:base',
125 '../../mojo/mojo_public.gyp:mojo_bindings_java', 125 '../../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
126 'device_battery_mojo_bindings', 126 'device_battery_mojo_bindings',
127 ], 127 ],
128 'variables': { 128 'variables': {
129 'java_in_dir': '../../device/battery/android/java', 129 'java_in_dir': '../../device/battery/android/java',
130 }, 130 },
131 'includes': [ '../../build/java.gypi' ], 131 'includes': [ '../../build/java.gypi' ],
132 }, 132 },
133 { 133 {
134 'target_name': 'device_battery_javatests', 134 'target_name': 'device_battery_javatests',
135 'type': 'none', 135 'type': 'none',
136 'variables': { 136 'variables': {
137 'java_in_dir': '../../device/battery/android/javatests', 137 'java_in_dir': '../../device/battery/android/javatests',
138 }, 138 },
139 'dependencies': [ 139 'dependencies': [
140 '../../base/base.gyp:base', 140 '../../base/base.gyp:base',
141 '../../base/base.gyp:base_java_test_support', 141 '../../base/base.gyp:base_java_test_support',
142 'device_battery_java', 142 'device_battery_java',
143 ], 143 ],
144 'includes': [ '../../build/java.gypi' ], 144 'includes': [ '../../build/java.gypi' ],
145 }, 145 },
146 ], 146 ],
147 }], 147 }],
148 ], 148 ],
149 } 149 }
OLDNEW
« no previous file with comments | « device/battery/android/BUILD.gn ('k') | device/device_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698