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

Side by Side Diff: chrome/BUILD.gn

Issue 2282573002: Remove is_ios conditions from chrome GN build files. (Closed)
Patch Set: merge 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/browser/BUILD.gn » ('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 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1167 # TODO(brettw) bug 581766: V8 should not be linked into the browser 1167 # TODO(brettw) bug 581766: V8 should not be linked into the browser
1168 # process, and then we can enable this. 1168 # process, and then we can enable this.
1169 #"//v8/*", 1169 #"//v8/*",
1170 ] 1170 ]
1171 } 1171 }
1172 } 1172 }
1173 1173
1174 # GYP version: chromium_child_dependencies variable in chrome.gyp 1174 # GYP version: chromium_child_dependencies variable in chrome.gyp
1175 group("child_dependencies") { 1175 group("child_dependencies") {
1176 public_deps = [ 1176 public_deps = [
1177 "//chrome/browser/devtools",
1178 "//chrome/child",
1177 "//chrome/common", 1179 "//chrome/common",
1180 "//chrome/gpu",
1181 "//chrome/renderer",
1182 "//chrome/utility",
1178 "//components/sync", 1183 "//components/sync",
1184 "//content/public/child",
1185 "//third_party/WebKit/public:blink_devtools_frontend_resources",
1179 ] 1186 ]
1180 if (!is_ios) {
1181 public_deps += [
1182 "//chrome/browser/devtools",
1183 "//chrome/child",
1184 "//chrome/gpu",
1185 "//chrome/renderer",
1186 "//chrome/utility",
1187 "//content/public/child",
1188 "//third_party/WebKit/public:blink_devtools_frontend_resources",
1189 ]
1190 }
1191 1187
1192 if (enable_nacl) { 1188 if (enable_nacl) {
1193 public_deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ] 1189 public_deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ]
1194 } 1190 }
1195 } 1191 }
1196 1192
1197 if (is_win) { 1193 if (is_win) {
1198 process_version("chrome_exe_version") { 1194 process_version("chrome_exe_version") {
1199 template_file = chrome_version_rc_template 1195 template_file = chrome_version_rc_template
1200 sources = [ 1196 sources = [
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
1276 # list individually when needed. 1272 # list individually when needed.
1277 "//chrome/browser:resources", 1273 "//chrome/browser:resources",
1278 "//chrome/common:resources", 1274 "//chrome/common:resources",
1279 "//chrome/renderer:resources", 1275 "//chrome/renderer:resources",
1280 ] 1276 ]
1281 } 1277 }
1282 1278
1283 # GYP version: chrome/chrome_resources.gyp:chrome_extra_resources 1279 # GYP version: chrome/chrome_resources.gyp:chrome_extra_resources
1284 group("extra_resources") { 1280 group("extra_resources") {
1285 public_deps = [ 1281 public_deps = [
1282 "//chrome/browser/resources:component_extension_resources",
1286 "//chrome/browser/resources:invalidations_resources", 1283 "//chrome/browser/resources:invalidations_resources",
1287 "//chrome/browser/resources:net_internals_resources", 1284 "//chrome/browser/resources:net_internals_resources",
1285 "//chrome/browser/resources:options_resources",
1288 "//chrome/browser/resources:password_manager_internals_resources", 1286 "//chrome/browser/resources:password_manager_internals_resources",
1289 "//chrome/browser/resources:policy_resources", 1287 "//chrome/browser/resources:policy_resources",
1288 "//chrome/browser/resources:settings_resources",
1290 "//chrome/browser/resources:translate_internals_resources", 1289 "//chrome/browser/resources:translate_internals_resources",
1291 ] 1290 ]
1292 if (!is_ios) {
1293 public_deps += [
1294 "//chrome/browser/resources:component_extension_resources",
1295 "//chrome/browser/resources:options_resources",
1296 "//chrome/browser/resources:settings_resources",
1297 ]
1298 }
1299 1291
1300 if (is_chromeos) { 1292 if (is_chromeos) {
1301 public_deps += [ "//chrome/browser/resources/chromeos/chromevox" ] 1293 public_deps += [ "//chrome/browser/resources/chromeos/chromevox" ]
1302 } 1294 }
1303 1295
1304 if (enable_extensions) { 1296 if (enable_extensions) {
1305 public_deps += [ 1297 public_deps += [
1306 "//chrome/browser/resources:quota_internals_resources", 1298 "//chrome/browser/resources:quota_internals_resources",
1307 "//chrome/browser/resources:sync_file_system_internals_resources", 1299 "//chrome/browser/resources:sync_file_system_internals_resources",
1308 ] 1300 ]
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 } 1352 }
1361 1353
1362 if (enable_hidpi) { 1354 if (enable_hidpi) {
1363 public_deps += [ ":repack_chrome_200_percent" ] 1355 public_deps += [ ":repack_chrome_200_percent" ]
1364 } 1356 }
1365 } 1357 }
1366 1358
1367 repack("packed_extra_resources") { 1359 repack("packed_extra_resources") {
1368 visibility = [ "./*" ] 1360 visibility = [ "./*" ]
1369 sources = [ 1361 sources = [
1362 "$root_gen_dir/blink/public/resources/blink_resources.pak",
1370 "$root_gen_dir/chrome/browser_resources.pak", 1363 "$root_gen_dir/chrome/browser_resources.pak",
1371 "$root_gen_dir/chrome/chrome_unscaled_resources.pak", 1364 "$root_gen_dir/chrome/chrome_unscaled_resources.pak",
1372 "$root_gen_dir/chrome/common_resources.pak", 1365 "$root_gen_dir/chrome/common_resources.pak",
1373 "$root_gen_dir/chrome/invalidations_resources.pak", 1366 "$root_gen_dir/chrome/invalidations_resources.pak",
1374 "$root_gen_dir/chrome/net_internals_resources.pak", 1367 "$root_gen_dir/chrome/net_internals_resources.pak",
1375 "$root_gen_dir/chrome/password_manager_internals_resources.pak", 1368 "$root_gen_dir/chrome/password_manager_internals_resources.pak",
1376 "$root_gen_dir/chrome/policy_resources.pak", 1369 "$root_gen_dir/chrome/policy_resources.pak",
1377 "$root_gen_dir/chrome/translate_internals_resources.pak", 1370 "$root_gen_dir/chrome/translate_internals_resources.pak",
1378 "$root_gen_dir/components/components_resources.pak", 1371 "$root_gen_dir/components/components_resources.pak",
1372 "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
1373 "$root_gen_dir/content/content_resources.pak",
1379 "$root_gen_dir/net/net_resources.pak", 1374 "$root_gen_dir/net/net_resources.pak",
1380 "$root_gen_dir/ui/resources/webui_resources.pak", 1375 "$root_gen_dir/ui/resources/webui_resources.pak",
1381 ] 1376 ]
1382 deps = [ 1377 deps = [
1383 "//chrome/app/theme:chrome_unscaled_resources", 1378 "//chrome/app/theme:chrome_unscaled_resources",
1384 "//chrome/browser:resources", 1379 "//chrome/browser:resources",
1385 "//chrome/browser/resources:invalidations_resources", 1380 "//chrome/browser/resources:invalidations_resources",
1386 "//chrome/browser/resources:net_internals_resources", 1381 "//chrome/browser/resources:net_internals_resources",
1387 "//chrome/browser/resources:password_manager_internals_resources", 1382 "//chrome/browser/resources:password_manager_internals_resources",
1388 "//chrome/browser/resources:policy_resources", 1383 "//chrome/browser/resources:policy_resources",
1389 "//chrome/browser/resources:translate_internals_resources", 1384 "//chrome/browser/resources:translate_internals_resources",
1390 "//chrome/common:resources", 1385 "//chrome/common:resources",
1391 "//components/resources", 1386 "//components/resources",
1387 "//content:resources",
1388 "//content/browser/tracing:resources",
1392 "//net:net_resources", 1389 "//net:net_resources",
1390 "//third_party/WebKit/public:resources",
1393 "//ui/resources", 1391 "//ui/resources",
1394 ] 1392 ]
1395 1393
1396 if (is_android) { 1394 if (is_android) {
1397 sources += [ "$root_gen_dir/android_webview/aw_resources.pak" ] 1395 sources += [ "$root_gen_dir/android_webview/aw_resources.pak" ]
1398 deps += [ "//android_webview:generate_aw_resources" ] 1396 deps += [ "//android_webview:generate_aw_resources" ]
1399 } 1397 } else { # Non-Android.
1400 if (!is_ios && !is_android) {
1401 # New paks should be added here by default. 1398 # New paks should be added here by default.
1402 sources += [ 1399 sources += [
1403 "$root_gen_dir/blink/devtools_resources.pak", 1400 "$root_gen_dir/blink/devtools_resources.pak",
1404 "$root_gen_dir/chrome/component_extension_resources.pak", 1401 "$root_gen_dir/chrome/component_extension_resources.pak",
1405 "$root_gen_dir/chrome/options_resources.pak", 1402 "$root_gen_dir/chrome/options_resources.pak",
1406 "$root_gen_dir/chrome/quota_internals_resources.pak", 1403 "$root_gen_dir/chrome/quota_internals_resources.pak",
1407 "$root_gen_dir/chrome/settings_resources.pak", 1404 "$root_gen_dir/chrome/settings_resources.pak",
1408 "$root_gen_dir/chrome/sync_file_system_internals_resources.pak", 1405 "$root_gen_dir/chrome/sync_file_system_internals_resources.pak",
1409 ] 1406 ]
1410 deps += [ 1407 deps += [
1411 "//chrome/browser/resources:component_extension_resources", 1408 "//chrome/browser/resources:component_extension_resources",
1412 "//chrome/browser/resources:options_resources", 1409 "//chrome/browser/resources:options_resources",
1413 "//chrome/browser/resources:quota_internals_resources", 1410 "//chrome/browser/resources:quota_internals_resources",
1414 "//chrome/browser/resources:settings_resources", 1411 "//chrome/browser/resources:settings_resources",
1415 "//chrome/browser/resources:sync_file_system_internals_resources", 1412 "//chrome/browser/resources:sync_file_system_internals_resources",
1416 "//content/browser/devtools:devtools_resources", 1413 "//content/browser/devtools:devtools_resources",
1417 ] 1414 ]
1418 } 1415 }
1419 if (!is_ios) {
1420 sources += [
1421 "$root_gen_dir/blink/public/resources/blink_resources.pak",
1422 "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
1423 "$root_gen_dir/content/content_resources.pak",
1424 ]
1425 deps += [
1426 "//content:resources",
1427 "//content/browser/tracing:resources",
1428 "//third_party/WebKit/public:resources",
1429 ]
1430 }
1431 if (is_chromeos) { 1416 if (is_chromeos) {
1432 sources += [ "$root_gen_dir/ui/file_manager/file_manager_resources.pak" ] 1417 sources += [ "$root_gen_dir/ui/file_manager/file_manager_resources.pak" ]
1433 deps += [ "//ui/file_manager:resources" ] 1418 deps += [ "//ui/file_manager:resources" ]
1434 } 1419 }
1435 if (enable_extensions) { 1420 if (enable_extensions) {
1436 sources += [ 1421 sources += [
1437 "$root_gen_dir/extensions/extensions_renderer_resources.pak", 1422 "$root_gen_dir/extensions/extensions_renderer_resources.pak",
1438 "$root_gen_dir/extensions/extensions_resources.pak", 1423 "$root_gen_dir/extensions/extensions_resources.pak",
1439 ] 1424 ]
1440 deps += [ "//extensions:extensions_resources" ] 1425 deps += [ "//extensions:extensions_resources" ]
1441 } 1426 }
1442 1427
1443 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms 1428 if (is_mac) {
1444 # it them copies it. This skipes the copy step and writes it to the final
1445 # location.
1446 if (is_mac || is_ios) {
1447 output = "$root_gen_dir/repack/resources.pak" 1429 output = "$root_gen_dir/repack/resources.pak"
1448 } else { 1430 } else {
1449 output = "$root_out_dir/resources.pak" 1431 output = "$root_out_dir/resources.pak"
1450 } 1432 }
1451 1433
1452 if (enable_resource_whitelist_generation) { 1434 if (enable_resource_whitelist_generation) {
1453 repack_whitelist = android_resource_whitelist 1435 repack_whitelist = android_resource_whitelist
1454 deps += [ "//chrome:resource_whitelist" ] 1436 deps += [ "//chrome:resource_whitelist" ]
1455 } 1437 }
1456 } 1438 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 repack_name = "${target_name}_repack" 1494 repack_name = "${target_name}_repack"
1513 repack_output_file = "$root_gen_dir/repack/chrome_${percent}_percent.pak" 1495 repack_output_file = "$root_gen_dir/repack/chrome_${percent}_percent.pak"
1514 1496
1515 copy_name = target_name 1497 copy_name = target_name
1516 1498
1517 repack(repack_name) { 1499 repack(repack_name) {
1518 visibility = [ ":$copy_name" ] 1500 visibility = [ ":$copy_name" ]
1519 1501
1520 # All sources should also have deps for completeness. 1502 # All sources should also have deps for completeness.
1521 sources = [ 1503 sources = [
1504 "$root_gen_dir/blink/public/resources/blink_image_resources_${percent}_per cent.pak",
1522 "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak", 1505 "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak",
1523 "$root_gen_dir/chrome/theme_resources_${percent}_percent.pak", 1506 "$root_gen_dir/chrome/theme_resources_${percent}_percent.pak",
1524 "$root_gen_dir/components/components_resources_${percent}_percent.pak", 1507 "$root_gen_dir/components/components_resources_${percent}_percent.pak",
1508 "$root_gen_dir/content/app/resources/content_resources_${percent}_percent. pak",
1525 "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak", 1509 "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
1526 ] 1510 ]
1527 1511
1528 deps = [ 1512 deps = [
1529 "//chrome/app/theme:theme_resources", 1513 "//chrome/app/theme:theme_resources",
1530 "//chrome/renderer:resources", 1514 "//chrome/renderer:resources",
1531 "//components/resources", 1515 "//components/resources",
1532 "//components/strings", 1516 "//components/strings",
1517 "//content/app/resources",
1533 "//net:net_resources", 1518 "//net:net_resources",
1519 "//third_party/WebKit/public:image_resources",
1534 "//ui/resources", 1520 "//ui/resources",
1535 ] 1521 ]
1536 1522
1537 if (!is_ios) {
1538 sources += [
1539 "$root_gen_dir/blink/public/resources/blink_image_resources_${percent}_p ercent.pak",
1540 "$root_gen_dir/content/app/resources/content_resources_${percent}_percen t.pak",
1541 ]
1542 deps += [
1543 "//content/app/resources",
1544 "//third_party/WebKit/public:image_resources",
1545 ]
1546 }
1547 if (use_ash) { 1523 if (use_ash) {
1548 sources += 1524 sources +=
1549 [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ] 1525 [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ]
1550 deps += [ "//ash/resources" ] 1526 deps += [ "//ash/resources" ]
1551 } 1527 }
1552 if (toolkit_views) { 1528 if (toolkit_views) {
1553 sources += [ "$root_gen_dir/ui/views/resources/views_resources_${percent}_ percent.pak" ] 1529 sources += [ "$root_gen_dir/ui/views/resources/views_resources_${percent}_ percent.pak" ]
1554 deps += [ "//ui/views/resources" ] 1530 deps += [ "//ui/views/resources" ]
1555 } 1531 }
1556 if (is_chromeos) { 1532 if (is_chromeos) {
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
1789 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1765 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1790 "//chrome/tools/build/linux/chrome-wrapper", 1766 "//chrome/tools/build/linux/chrome-wrapper",
1791 "//third_party/xdg-utils/scripts/xdg-mime", 1767 "//third_party/xdg-utils/scripts/xdg-mime",
1792 "//third_party/xdg-utils/scripts/xdg-settings", 1768 "//third_party/xdg-utils/scripts/xdg-settings",
1793 ] 1769 ]
1794 outputs = [ 1770 outputs = [
1795 "$root_out_dir/{{source_file_part}}", 1771 "$root_out_dir/{{source_file_part}}",
1796 ] 1772 ]
1797 } 1773 }
1798 } 1774 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698