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

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: Actually undo gyp change Created 6 years, 2 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
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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 } else { 83 } else {
84 # Non-iOS. 84 # Non-iOS.
85 deps += [ 85 deps += [
86 "//components/visitedlink/common", 86 "//components/visitedlink/common",
87 "//components/autofill/content/common", 87 "//components/autofill/content/common",
88 "//components/autofill/core/common", 88 "//components/autofill/core/common",
89 "//components/password_manager/content/common", 89 "//components/password_manager/content/common",
90 "//components/password_manager/core/common", 90 "//components/password_manager/core/common",
91 "//components/signin/core/common", 91 "//components/signin/core/common",
92 "//components/translate/content/common", 92 "//components/translate/content/common",
93 "//extensions/common",
93 "//ipc", 94 "//ipc",
94 "//third_party/re2", 95 "//third_party/re2",
95 "//third_party/widevine/cdm:version_h", 96 "//third_party/widevine/cdm:version_h",
96 ] 97 ]
97 } 98 }
98 99
99 if (enable_extensions) { 100 if (enable_extensions) {
100 sources += rebase_path( 101 sources += rebase_path(
101 gypi_values.chrome_common_extensions_sources, 102 gypi_values.chrome_common_extensions_sources,
102 ".", "//chrome") 103 ".", "//chrome")
103 deps += [ 104 deps += [
104 "//device/bluetooth", # TODO(thestig) Still needed? Not in gyp version. 105 "//device/bluetooth", # TODO(thestig) Still needed? Not in gyp version.
105 "//device/usb", 106 "//device/usb",
106 "//chrome/common/extensions/api", 107 "//chrome/common/extensions/api",
107 "//extensions/common",
108 "//extensions/common/api", 108 "//extensions/common/api",
109 ] 109 ]
110 } 110 }
111 111
112 if (is_win || is_mac) { 112 if (is_win || is_mac) {
113 sources += rebase_path( 113 sources += rebase_path(
114 gypi_values.chrome_common_win_mac_sources, 114 gypi_values.chrome_common_win_mac_sources,
115 ".", "//chrome") 115 ".", "//chrome")
116 if (use_openssl) { 116 if (use_openssl) {
117 sources -= [ 117 sources -= [
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 if (is_win || is_mac) { 301 if (is_win || is_mac) {
302 sources += [ 302 sources += [
303 "media_galleries/picasa_test_util.cc", 303 "media_galleries/picasa_test_util.cc",
304 "media_galleries/picasa_test_util.h", 304 "media_galleries/picasa_test_util.h",
305 "media_galleries/pmp_test_util.cc", 305 "media_galleries/pmp_test_util.cc",
306 "media_galleries/pmp_test_util.h", 306 "media_galleries/pmp_test_util.h",
307 ] 307 ]
308 } 308 }
309 309
310 } 310 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698