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

Unified Diff: base/BUILD.gn

Issue 290633012: Fix GN win build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/allocator/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 3bbd8978a8afefd7d5ef5e2c8a72fd0b5e0f6294..53b236d4f7c482d4f1dd0eb157830aa7c3525832 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -810,12 +810,13 @@ component("base") {
"sha1_win.cc",
]
- if (is_component_build) {
- sources -= [ "debug/debug_on_start_win.cc" ]
- }
-
- # Needed by win_util.h
- libs = [ "netapi32.lib" ]
+ libs = [
+ "netapi32.lib",
+ "powrprof.lib",
+ ]
+ ldflags = [
+ "/DELAYLOAD:powrprof.dll",
+ ]
} else if (!is_nacl) {
# Non-Windows.
deps += [ "//third_party/libevent" ]
@@ -967,7 +968,6 @@ source_set("prefs") {
"prefs/value_map_pref_store.cc",
"prefs/value_map_pref_store.h",
"prefs/writeable_pref_store.h",
-
]
defines = [ "BASE_PREFS_IMPLEMENTATION" ]
@@ -1109,7 +1109,6 @@ test("base_unittests") {
"message_loop/message_loop_unittest.cc",
"message_loop/message_pump_glib_unittest.cc",
"message_loop/message_pump_io_ios_unittest.cc",
- "message_loop/message_pump_libevent_unittest.cc",
"metrics/sample_map_unittest.cc",
"metrics/sample_vector_unittest.cc",
"metrics/bucket_ranges_unittest.cc",
@@ -1251,7 +1250,6 @@ test("base_unittests") {
if (is_ios) {
sources -= [
- "message_loop/message_pump_libevent_unittest.cc", # libevent not used.
"metrics/stats_table_uinittest.cc", # Requires spawning a process.
"process/memory_unittest.cc",
"process/memory_unittest_mac.h",
@@ -1285,16 +1283,8 @@ test("base_unittests") {
sources -= [ "message_loop/message_pump_glib_unittest.cc" ]
}
- if (is_win) {
- sources -= [
- "file_descriptor_shuffle_unittest.cc",
- "files/dir_reader_posix_unittest.cc",
- "threading/worker_pool_posix_unittest.cc",
- "message_loop/message_pump_libevent_unittest.cc",
- ]
- }
-
- if (!is_win || is_ios) {
+ if (is_posix || is_ios) {
+ sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
deps += [ "//third_party/libevent" ]
}
« no previous file with comments | « no previous file | base/allocator/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698