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

Side by Side Diff: chrome/BUILD.gn

Issue 2351003002: Remove GYP annotations from chrome, ui, tools GN files. (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | chrome/android/chrome_public_apk_tmpl.gni » ('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 import("//build/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 import("//build/config/compiler/compiler.gni") 7 import("//build/config/compiler/compiler.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/locales.gni") 9 import("//build/config/locales.gni")
10 import("//build/config/sanitizers/sanitizers.gni") 10 import("//build/config/sanitizers/sanitizers.gni")
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 ] 224 ]
225 if (enable_plugins && enable_pdf) { 225 if (enable_plugins && enable_pdf) {
226 deps += [ "//pdf" ] 226 deps += [ "//pdf" ]
227 } 227 }
228 228
229 public_deps = [ 229 public_deps = [
230 ":xdg_mime", # Needs to be public for installer to consume files. 230 ":xdg_mime", # Needs to be public for installer to consume files.
231 "//chrome/common:features", 231 "//chrome/common:features",
232 ] 232 ]
233 233
234 # GYP has this in a 'profiling==0 and linux_disable_pie==0' condition.
235 # but GN doesn't have either of these flags.
236 ldflags = [ "-pie" ] 234 ldflags = [ "-pie" ]
237 235
238 if (use_pango || use_cairo) { 236 if (use_pango || use_cairo) {
239 # Needed for chrome_main.cc initialization of libraries. 237 # Needed for chrome_main.cc initialization of libraries.
240 configs += [ "//build/config/linux/pangocairo" ] 238 configs += [ "//build/config/linux/pangocairo" ]
241 } 239 }
242 240
243 if (use_x11) { 241 if (use_x11) {
244 configs += [ 242 configs += [
245 "//build/config/linux:x11", 243 "//build/config/linux:x11",
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 if (enable_plugins && enable_pdf && !is_multi_dll_chrome) { 372 if (enable_plugins && enable_pdf && !is_multi_dll_chrome) {
375 deps += [ "//pdf" ] 373 deps += [ "//pdf" ]
376 } 374 }
377 375
378 if (enable_package_mash_services) { 376 if (enable_package_mash_services) {
379 deps += [ "//chrome/app/mash" ] 377 deps += [ "//chrome/app/mash" ]
380 } 378 }
381 } 379 }
382 380
383 if (is_multi_dll_chrome) { 381 if (is_multi_dll_chrome) {
384 # This manifest matches what GYP produces. It may not even be necessary. 382 # This manifest matches what GYP produced. It may not even be necessary.
385 windows_manifest("chrome_child_manifest") { 383 windows_manifest("chrome_child_manifest") {
386 sources = [ 384 sources = [
387 as_invoker_manifest, 385 as_invoker_manifest,
388 ] 386 ]
389 type = "dll" 387 type = "dll"
390 } 388 }
391 389
392 shared_library("chrome_child") { 390 shared_library("chrome_child") {
393 sources = [ 391 sources = [
394 "app/chrome_main.cc", 392 "app/chrome_main.cc",
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 ] 1130 ]
1133 } 1131 }
1134 } else { 1132 } else {
1135 group("chrome_dump_syms") { 1133 group("chrome_dump_syms") {
1136 } 1134 }
1137 group("chrome_dsym_archive") { 1135 group("chrome_dsym_archive") {
1138 } 1136 }
1139 } 1137 }
1140 } 1138 }
1141 1139
1142 # GYP version: chromium_browser_dependencies variable in chrome.gyp
1143 group("browser_dependencies") { 1140 group("browser_dependencies") {
1144 public_deps = [ 1141 public_deps = [
1145 "//chrome/browser", 1142 "//chrome/browser",
1146 "//chrome/common", 1143 "//chrome/common",
1147 "//components/sync", 1144 "//components/sync",
1148 ] 1145 ]
1149 if (enable_plugins) { 1146 if (enable_plugins) {
1150 public_deps += [ "//ppapi/host" ] 1147 public_deps += [ "//ppapi/host" ]
1151 } 1148 }
1152 1149
(...skipping 11 matching lines...) Expand all
1164 # Note that the blink_headers target is OK, so we can't do a wildcard for 1161 # Note that the blink_headers target is OK, so we can't do a wildcard for
1165 # all blink targets. 1162 # all blink targets.
1166 "//third_party/WebKit/public:blink", 1163 "//third_party/WebKit/public:blink",
1167 # TODO(brettw) bug 581766: V8 should not be linked into the browser 1164 # TODO(brettw) bug 581766: V8 should not be linked into the browser
1168 # process, and then we can enable this. 1165 # process, and then we can enable this.
1169 #"//v8/*", 1166 #"//v8/*",
1170 ] 1167 ]
1171 } 1168 }
1172 } 1169 }
1173 1170
1174 # GYP version: chromium_child_dependencies variable in chrome.gyp
1175 group("child_dependencies") { 1171 group("child_dependencies") {
1176 public_deps = [ 1172 public_deps = [
1177 "//chrome/browser/devtools", 1173 "//chrome/browser/devtools",
1178 "//chrome/child", 1174 "//chrome/child",
1179 "//chrome/common", 1175 "//chrome/common",
1180 "//chrome/gpu", 1176 "//chrome/gpu",
1181 "//chrome/renderer", 1177 "//chrome/renderer",
1182 "//chrome/utility", 1178 "//chrome/utility",
1183 "//components/sync", 1179 "//components/sync",
1184 "//content/public/child", 1180 "//content/public/child",
(...skipping 13 matching lines...) Expand all
1198 output = "$target_gen_dir/chrome_exe_version.rc" 1194 output = "$target_gen_dir/chrome_exe_version.rc"
1199 } 1195 }
1200 1196
1201 process_version_rc_template("chrome_dll_version") { 1197 process_version_rc_template("chrome_dll_version") {
1202 sources = [ 1198 sources = [
1203 "app/chrome_dll.ver", 1199 "app/chrome_dll.ver",
1204 ] 1200 ]
1205 output = "$target_gen_dir/chrome_dll_version.rc" 1201 output = "$target_gen_dir/chrome_dll_version.rc"
1206 } 1202 }
1207 1203
1208 # This manifest matches what GYP produces. It may not even be necessary. 1204 # This manifest matches what GYP produced. It may not even be necessary.
1209 windows_manifest("chrome_dll_manifest") { 1205 windows_manifest("chrome_dll_manifest") {
1210 sources = [ 1206 sources = [
1211 as_invoker_manifest, 1207 as_invoker_manifest,
1212 common_controls_manifest, 1208 common_controls_manifest,
1213 ] 1209 ]
1214 type = "dll" 1210 type = "dll"
1215 } 1211 }
1216 1212
1217 process_version_rc_template("nacl64_exe_version") { 1213 process_version_rc_template("nacl64_exe_version") {
1218 sources = [ 1214 sources = [
(...skipping 13 matching lines...) Expand all
1232 sources = [ 1228 sources = [
1233 "app/file_pre_reader_win.cc", 1229 "app/file_pre_reader_win.cc",
1234 "app/file_pre_reader_win.h", 1230 "app/file_pre_reader_win.h",
1235 ] 1231 ]
1236 deps = [ 1232 deps = [
1237 "//base", 1233 "//base",
1238 ] 1234 ]
1239 } 1235 }
1240 } 1236 }
1241 1237
1242 # GYP version: chrome/chrome_exe.gypi:visual_elements_resources
1243 copy("visual_elements_resources") { 1238 copy("visual_elements_resources") {
1244 sources = [ 1239 sources = [
1245 "//chrome/app/theme/$branding_path_component/win/tiles/Logo.png", 1240 "//chrome/app/theme/$branding_path_component/win/tiles/Logo.png",
1246 "//chrome/app/theme/$branding_path_component/win/tiles/SmallLogo.png", 1241 "//chrome/app/theme/$branding_path_component/win/tiles/SmallLogo.png",
1247 "app/visual_elements_resources/chrome.VisualElementsManifest.xml", 1242 "app/visual_elements_resources/chrome.VisualElementsManifest.xml",
1248 ] 1243 ]
1249 1244
1250 if (is_chrome_branded) { 1245 if (is_chrome_branded) {
1251 sources += [ 1246 sources += [
1252 "//chrome/app/theme/$branding_path_component/win/tiles/LogoCanary.png", 1247 "//chrome/app/theme/$branding_path_component/win/tiles/LogoCanary.png",
1253 "//chrome/app/theme/$branding_path_component/win/tiles/SmallLogoCanary.png ", 1248 "//chrome/app/theme/$branding_path_component/win/tiles/SmallLogoCanary.png ",
1254 ] 1249 ]
1255 } 1250 }
1256 1251
1257 outputs = [ 1252 outputs = [
1258 "$root_out_dir/{{source_file_part}}", 1253 "$root_out_dir/{{source_file_part}}",
1259 ] 1254 ]
1260 } 1255 }
1261 1256
1262 # GYP version: chrome/chrome_resources.gyp:chrome_resources
1263 group("resources") { 1257 group("resources") {
1264 public_deps = [ 1258 public_deps = [
1265 # Note: GYP lists some dependencies in addition to these actions. However,
1266 # these are just dependencies for the actions themselves, which our actions
1267 # list individually when needed.
1268 "//chrome/browser:resources", 1259 "//chrome/browser:resources",
1269 "//chrome/common:resources", 1260 "//chrome/common:resources",
1270 "//chrome/renderer:resources", 1261 "//chrome/renderer:resources",
1271 ] 1262 ]
1272 } 1263 }
1273 1264
1274 # GYP version: chrome/chrome_resources.gyp:chrome_extra_resources
1275 group("extra_resources") { 1265 group("extra_resources") {
1276 public_deps = [ 1266 public_deps = [
1277 "//chrome/browser/resources:component_extension_resources", 1267 "//chrome/browser/resources:component_extension_resources",
1278 "//chrome/browser/resources:invalidations_resources", 1268 "//chrome/browser/resources:invalidations_resources",
1279 "//chrome/browser/resources:net_internals_resources", 1269 "//chrome/browser/resources:net_internals_resources",
1280 "//chrome/browser/resources:options_resources", 1270 "//chrome/browser/resources:options_resources",
1281 "//chrome/browser/resources:password_manager_internals_resources", 1271 "//chrome/browser/resources:password_manager_internals_resources",
1282 "//chrome/browser/resources:policy_resources", 1272 "//chrome/browser/resources:policy_resources",
1283 "//chrome/browser/resources:settings_resources", 1273 "//chrome/browser/resources:settings_resources",
1284 "//chrome/browser/resources:translate_internals_resources", 1274 "//chrome/browser/resources:translate_internals_resources",
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
1368 1358
1369 copy_data_to_bundle = is_mac 1359 copy_data_to_bundle = is_mac
1370 if (enable_resource_whitelist_generation) { 1360 if (enable_resource_whitelist_generation) {
1371 repack_whitelist = chrome_resource_whitelist 1361 repack_whitelist = chrome_resource_whitelist
1372 deps = [ 1362 deps = [
1373 ":resource_whitelist", 1363 ":resource_whitelist",
1374 ] 1364 ]
1375 } 1365 }
1376 } 1366 }
1377 1367
1378 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak
1379 repack("browser_tests_pak") { 1368 repack("browser_tests_pak") {
1380 sources = [ 1369 sources = [
1381 "$root_gen_dir/chrome/options_test_resources.pak", 1370 "$root_gen_dir/chrome/options_test_resources.pak",
1382 "$root_gen_dir/chrome/webui_test_resources.pak", 1371 "$root_gen_dir/chrome/webui_test_resources.pak",
1383 ] 1372 ]
1384 output = "$root_out_dir/browser_tests.pak" 1373 output = "$root_out_dir/browser_tests.pak"
1385 deps = [ 1374 deps = [
1386 "//chrome/browser/resources:options_test_resources", 1375 "//chrome/browser/resources:options_test_resources",
1387 "//chrome/test/data:webui_test_resources", 1376 "//chrome/test/data:webui_test_resources",
1388 ] 1377 ]
1389 } 1378 }
1390 1379
1391 # GYP version: chrome/chrome_resources.gyp:chrome_strings
1392 group("strings") { 1380 group("strings") {
1393 public_deps = [ 1381 public_deps = [
1394 "//chrome/app:chromium_strings", 1382 "//chrome/app:chromium_strings",
1395 "//chrome/app:generated_resources", 1383 "//chrome/app:generated_resources",
1396 "//chrome/app:google_chrome_strings", 1384 "//chrome/app:google_chrome_strings",
1397 "//chrome/app/resources:locale_settings", 1385 "//chrome/app/resources:locale_settings",
1398 ] 1386 ]
1399 } 1387 }
1400 1388
1401 if (is_android) { 1389 if (is_android) {
1402 # GYP: //chrome/chrome.gyp:data_use_ui_message_enum_java
1403 java_cpp_enum("data_use_ui_message_enum_javagen") { 1390 java_cpp_enum("data_use_ui_message_enum_javagen") {
1404 sources = [ 1391 sources = [
1405 "browser/android/data_usage/data_use_tab_ui_manager_android.cc", 1392 "browser/android/data_usage/data_use_tab_ui_manager_android.cc",
1406 ] 1393 ]
1407 } 1394 }
1408 1395
1409 # GYP: //chrome/chrome.gyp:content_setting_java
1410 java_cpp_enum("content_setting_javagen") { 1396 java_cpp_enum("content_setting_javagen") {
1411 sources = [ 1397 sources = [
1412 "../components/content_settings/core/common/content_settings.h", 1398 "../components/content_settings/core/common/content_settings.h",
1413 ] 1399 ]
1414 } 1400 }
1415 1401
1416 # GYP: //chrome/chrome.gyp:content_settings_type_java
1417 java_cpp_enum("content_settings_type_javagen") { 1402 java_cpp_enum("content_settings_type_javagen") {
1418 sources = [ 1403 sources = [
1419 "../components/content_settings/core/common/content_settings_types.h", 1404 "../components/content_settings/core/common/content_settings_types.h",
1420 ] 1405 ]
1421 } 1406 }
1422 1407
1423 # GYP: //chrome/chrome.gyp:signin_metrics_enum_java
1424 java_cpp_enum("signin_metrics_enum_javagen") { 1408 java_cpp_enum("signin_metrics_enum_javagen") {
1425 sources = [ 1409 sources = [
1426 "../components/signin/core/browser/signin_metrics.h", 1410 "../components/signin/core/browser/signin_metrics.h",
1427 ] 1411 ]
1428 } 1412 }
1429 1413
1430 # GYP: //chrome/chrome.gyp:page_info_connection_type_java
1431 java_cpp_enum("page_info_connection_type_javagen") { 1414 java_cpp_enum("page_info_connection_type_javagen") {
1432 sources = [ 1415 sources = [
1433 "browser/ui/android/website_settings_popup_android.h", 1416 "browser/ui/android/website_settings_popup_android.h",
1434 ] 1417 ]
1435 } 1418 }
1436 1419
1437 # GYP: //chrome/chrome.gyp:website_settings_action_java
1438 java_cpp_enum("website_settings_action_javagen") { 1420 java_cpp_enum("website_settings_action_javagen") {
1439 sources = [ 1421 sources = [
1440 "browser/ui/website_settings/website_settings.h", 1422 "browser/ui/website_settings/website_settings.h",
1441 ] 1423 ]
1442 } 1424 }
1443 1425
1444 # GYP: //chrome/chrome_android.gypi:chrome_android_core
1445 source_set("chrome_android_core") { 1426 source_set("chrome_android_core") {
1446 sources = [ 1427 sources = [
1447 "app/android/chrome_android_initializer.cc", 1428 "app/android/chrome_android_initializer.cc",
1448 "app/android/chrome_android_initializer.h", 1429 "app/android/chrome_android_initializer.h",
1449 "app/android/chrome_jni_onload.cc", 1430 "app/android/chrome_jni_onload.cc",
1450 "app/android/chrome_jni_onload.h", 1431 "app/android/chrome_jni_onload.h",
1451 "app/android/chrome_main_delegate_android.cc", 1432 "app/android/chrome_main_delegate_android.cc",
1452 "app/android/chrome_main_delegate_android.h", 1433 "app/android/chrome_main_delegate_android.h",
1453 "app/chrome_main_delegate.cc", 1434 "app/chrome_main_delegate.cc",
1454 "app/chrome_main_delegate.h", 1435 "app/chrome_main_delegate.h",
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1541 if (is_official_build) { 1522 if (is_official_build) {
1542 action("linux_symbols") { 1523 action("linux_symbols") {
1543 script = "//build/linux/dump_app_syms.py" 1524 script = "//build/linux/dump_app_syms.py"
1544 1525
1545 dump_syms_label = "//breakpad:dump_syms($host_toolchain)" 1526 dump_syms_label = "//breakpad:dump_syms($host_toolchain)"
1546 dump_syms_binary = 1527 dump_syms_binary =
1547 get_label_info(dump_syms_label, "root_out_dir") + "/" + "dump_syms" 1528 get_label_info(dump_syms_label, "root_out_dir") + "/" + "dump_syms"
1548 1529
1549 chrome_binary = "$root_out_dir/chrome" 1530 chrome_binary = "$root_out_dir/chrome"
1550 if (current_cpu == "x86") { 1531 if (current_cpu == "x86") {
1551 # Use "ia32" instead of "x86" for GYP compat. 1532 # GYP used "ia32" so keep that naming for back-compat.
1552 symbol_file = "$root_out_dir/chrome.breakpad.ia32" 1533 symbol_file = "$root_out_dir/chrome.breakpad.ia32"
1553 } else { 1534 } else {
1554 symbol_file = "$root_out_dir/chrome.breakpad.$current_cpu" 1535 symbol_file = "$root_out_dir/chrome.breakpad.$current_cpu"
1555 } 1536 }
1556 1537
1557 inputs = [ 1538 inputs = [
1558 chrome_binary, 1539 chrome_binary,
1559 dump_syms_binary, 1540 dump_syms_binary,
1560 ] 1541 ]
1561 outputs = [ 1542 outputs = [
(...skipping 20 matching lines...) Expand all
1582 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1563 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1583 "//chrome/tools/build/linux/chrome-wrapper", 1564 "//chrome/tools/build/linux/chrome-wrapper",
1584 "//third_party/xdg-utils/scripts/xdg-mime", 1565 "//third_party/xdg-utils/scripts/xdg-mime",
1585 "//third_party/xdg-utils/scripts/xdg-settings", 1566 "//third_party/xdg-utils/scripts/xdg-settings",
1586 ] 1567 ]
1587 outputs = [ 1568 outputs = [
1588 "$root_out_dir/{{source_file_part}}", 1569 "$root_out_dir/{{source_file_part}}",
1589 ] 1570 ]
1590 } 1571 }
1591 } 1572 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698