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

Side by Side Diff: chrome/common/BUILD.gn

Issue 666813002: GN: Fix Android component build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-clank
Patch Set: Created 6 years, 1 month 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
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 import("//tools/grit/grit_rule.gni") 5 import("//tools/grit/grit_rule.gni")
6 6
7 gypi_values = exec_script( 7 gypi_values = exec_script(
8 "//build/gypi_to_gn.py", 8 "//build/gypi_to_gn.py",
9 [ rebase_path("../chrome_common.gypi") ], 9 [ rebase_path("../chrome_common.gypi") ],
10 "scope", 10 "scope",
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 ] 99 ]
100 } 100 }
101 101
102 if (enable_extensions) { 102 if (enable_extensions) {
103 sources += rebase_path( 103 sources += rebase_path(
104 gypi_values.chrome_common_extensions_sources, 104 gypi_values.chrome_common_extensions_sources,
105 ".", "//chrome") 105 ".", "//chrome")
106 deps += [ 106 deps += [
107 "//device/bluetooth", # TODO(thestig) Still needed? Not in gyp version. 107 "//device/bluetooth", # TODO(thestig) Still needed? Not in gyp version.
108 "//device/usb", 108 "//device/usb",
109 "//extensions/common",
Lei Zhang 2014/10/24 02:55:51 Revert this change, it was fine as is.
cjhopman 2014/10/24 21:41:11 Done.
109 "//chrome/common/extensions/api", 110 "//chrome/common/extensions/api",
110 "//extensions/common",
111 "//extensions/common/api", 111 "//extensions/common/api",
112 "//extensions:extensions_resources", 112 "//extensions:extensions_resources",
113 "//extensions/strings", 113 "//extensions/strings",
114 ] 114 ]
115 } 115 }
116 116
117 if (is_win || is_mac) { 117 if (is_win || is_mac) {
118 sources += rebase_path( 118 sources += rebase_path(
119 gypi_values.chrome_common_win_mac_sources, 119 gypi_values.chrome_common_win_mac_sources,
120 ".", "//chrome") 120 ".", "//chrome")
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 } 311 }
312 312
313 if (enable_extensions) { 313 if (enable_extensions) {
314 sources += [ 314 sources += [
315 "extensions/extension_test_util.cc", 315 "extensions/extension_test_util.cc",
316 "extensions/extension_test_util.h", 316 "extensions/extension_test_util.h",
317 ] 317 ]
318 } 318 }
319 319
320 } 320 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698