OLD | NEW |
---|---|
1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 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 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 | 7 |
8 if (is_android) { | 8 if (is_android) { |
9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
10 } | 10 } |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
50 sources -= [ "power_save_blocker_ozone.cc" ] | 50 sources -= [ "power_save_blocker_ozone.cc" ] |
51 } | 51 } |
52 if (is_chromeos || !use_x11 || !use_dbus) { | 52 if (is_chromeos || !use_x11 || !use_dbus) { |
53 sources -= [ "power_save_blocker_x11.cc" ] | 53 sources -= [ "power_save_blocker_x11.cc" ] |
54 } | 54 } |
55 | 55 |
56 if (is_android) { | 56 if (is_android) { |
57 deps += [ | 57 deps += [ |
58 ":jni_headers", | 58 ":jni_headers", |
59 "//ui/android", | 59 "//ui/android", |
60 "//ui/gfx", | |
aelias_OOO_until_Jul13
2017/05/17 04:47:15
This doesn't belong here, incorporated another pat
Jinsuk Kim
2017/05/17 04:49:50
This change looks irrelvant.
jaebaek
2017/05/18 01:44:28
This requires an independent patch.
The problem is
Jinsuk Kim
2017/05/18 02:19:51
So this is a side effect of view_android.h having
| |
60 ] | 61 ] |
61 } | 62 } |
62 | 63 |
63 if (is_chromeos) { | 64 if (is_chromeos) { |
64 deps += [ | 65 deps += [ |
65 "//chromeos", | 66 "//chromeos", |
66 "//chromeos:power_manager_proto", | 67 "//chromeos:power_manager_proto", |
67 ] | 68 ] |
68 } | 69 } |
69 | 70 |
(...skipping 14 matching lines...) Expand all Loading... | |
84 } | 85 } |
85 | 86 |
86 android_library("java") { | 87 android_library("java") { |
87 java_files = java_sources_needing_jni | 88 java_files = java_sources_needing_jni |
88 deps = [ | 89 deps = [ |
89 "//base:base_java", | 90 "//base:base_java", |
90 "//ui/android:ui_java", | 91 "//ui/android:ui_java", |
91 ] | 92 ] |
92 } | 93 } |
93 } | 94 } |
OLD | NEW |