Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/compiler/pgo/pgo.gni") | 8 import("//build/config/compiler/pgo/pgo.gni") |
| 9 import("//build/config/features.gni") | 9 import("//build/config/features.gni") |
| 10 import("//build/config/locales.gni") | 10 import("//build/config/locales.gni") |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 520 sources = [ | 520 sources = [ |
| 521 "app/chrome_exe_main_mac.c", | 521 "app/chrome_exe_main_mac.c", |
| 522 ] | 522 ] |
| 523 | 523 |
| 524 extra_configs = [ "//build/config/compiler:wexit_time_destructors" ] | 524 extra_configs = [ "//build/config/compiler:wexit_time_destructors" ] |
| 525 | 525 |
| 526 deps = [ | 526 deps = [ |
| 527 ":chrome_app_strings_bundle_data", | 527 ":chrome_app_strings_bundle_data", |
| 528 ":chrome_resources", | 528 ":chrome_resources", |
| 529 ":chrome_versioned_bundle_data", | 529 ":chrome_versioned_bundle_data", |
| 530 ":widevine_add_framework_signature", | |
| 530 "//build/config/sanitizers:deps", | 531 "//build/config/sanitizers:deps", |
| 531 "//chrome/common:version_header", | 532 "//chrome/common:version_header", |
| 532 ] | 533 ] |
| 533 | 534 |
| 534 # Remove the default strip configuration (which strips all symbols) so that | 535 # Remove the default strip configuration (which strips all symbols) so that |
| 535 # a saves file can be specified. | 536 # a saves file can be specified. |
| 536 if (enable_stripping) { | 537 if (enable_stripping) { |
| 537 remove_configs = [ "//build/config/mac:strip_all" ] | 538 remove_configs = [ "//build/config/mac:strip_all" ] |
| 538 | 539 |
| 539 ldflags = | 540 ldflags = |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 644 # bundle via a script that performs additional actions, rather than | 645 # bundle via a script that performs additional actions, rather than |
| 645 # relying on a bundle_data to copy it. | 646 # relying on a bundle_data to copy it. |
| 646 ":keystone_registration_framework", | 647 ":keystone_registration_framework", |
| 647 | 648 |
| 648 # verify_chrome_framework_order depends on :chrome_framework and, for | 649 # verify_chrome_framework_order depends on :chrome_framework and, for |
| 649 # non-component builds, will ensure the export symbol table is correct. | 650 # non-component builds, will ensure the export symbol table is correct. |
| 650 ":verify_chrome_framework_order", | 651 ":verify_chrome_framework_order", |
| 651 ] | 652 ] |
| 652 } | 653 } |
| 653 | 654 |
| 655 # On official builds, Widevine needs a signature file for the framework. | |
| 656 # Copy this file directly into the final output directory. | |
| 657 if (is_chrome_branded && enable_pepper_cdms) { | |
| 658 copy("widevine_add_framework_signature") { | |
| 659 sources = [ | |
| 660 "$root_out_dir/$chrome_framework_name.sig", | |
| 661 ] | |
| 662 | |
| 663 final_directory = "$root_out_dir/$chrome_product_full_name.app/Contents/Ve rsions/$chrome_version_full/$chrome_framework_name.framework/" | |
|
Robert Sesek
2017/02/21 16:15:00
I think this is just re-introducing the issue I ra
jrummell
2017/02/21 19:54:56
I tried that earlier. With "sources += [ "$root_ou
Robert Sesek
2017/02/21 22:26:48
Shouldn't it be copied into Contents/Versions/58.0
jrummell
2017/02/22 01:02:08
Yes. I had the directories all expanded in the Fin
| |
| 664 if (defined(chrome_framework_version)) { | |
| 665 final_directory += "Versions/$chrome_framework_version/" | |
| 666 } | |
| 667 outputs = [ | |
| 668 "$final_directory/{{source_file_part}}", | |
| 669 ] | |
| 670 | |
| 671 deps = [ | |
| 672 ":chrome_versioned_bundle_data", | |
| 673 ":sign_chrome_framework_for_widevine", | |
| 674 ] | |
| 675 } | |
| 676 } else { | |
| 677 group("widevine_add_framework_signature") { | |
| 678 } | |
| 679 } | |
| 680 | |
| 654 action("clean_up_old_versions") { | 681 action("clean_up_old_versions") { |
| 655 script = "//chrome/tools/build/mac/clean_up_old_versions.py" | 682 script = "//chrome/tools/build/mac/clean_up_old_versions.py" |
| 656 outputs = [ | 683 outputs = [ |
| 657 "$root_gen_dir/run_$target_name.stamp", | 684 "$root_gen_dir/run_$target_name.stamp", |
| 658 ] | 685 ] |
| 659 args = [ | 686 args = [ |
| 660 rebase_path("$root_out_dir/$chrome_product_full_name.app", | 687 rebase_path("$root_out_dir/$chrome_product_full_name.app", |
| 661 root_build_dir), | 688 root_build_dir), |
| 662 "$chrome_version_full", | 689 "$chrome_version_full", |
| 663 ] + rebase_path(outputs, root_build_dir) | 690 ] + rebase_path(outputs, root_build_dir) |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 855 "{{bundle_root_dir}}/Libraries/$widevine_cdm_path/{{source_file_part}}", | 882 "{{bundle_root_dir}}/Libraries/$widevine_cdm_path/{{source_file_part}}", |
| 856 ] | 883 ] |
| 857 public_deps = [ | 884 public_deps = [ |
| 858 # Need this intermediate dependency because "widevinecdm" is a | 885 # Need this intermediate dependency because "widevinecdm" is a |
| 859 # shared_library if !is_chrome_branded, and then depending on | 886 # shared_library if !is_chrome_branded, and then depending on |
| 860 # "widevinecdm" directly would cause it to be linked into the Chromium | 887 # "widevinecdm" directly would cause it to be linked into the Chromium |
| 861 # Framework, which we don't want. | 888 # Framework, which we don't want. |
| 862 ":widevine_cdm_library_copy", | 889 ":widevine_cdm_library_copy", |
| 863 "//third_party/widevine/cdm:widevinecdmadapter", | 890 "//third_party/widevine/cdm:widevinecdmadapter", |
| 864 ] | 891 ] |
| 892 | |
| 893 # Signatures are only generated for official chrome. | |
| 894 if (is_chrome_branded) { | |
| 895 sources += [ | |
| 896 "$root_out_dir/$widevine_cdm_path/widevinecdmadapter.plugin.sig", | |
| 897 "$root_out_dir/libwidevinecdm.dylib.sig", | |
| 898 ] | |
| 899 public_deps += [ ":sign_cdm_adapter_for_widevine" ] | |
| 900 } | |
| 865 } | 901 } |
| 866 | 902 |
| 867 copy("widevine_cdm_library_copy") { | 903 copy("widevine_cdm_library_copy") { |
| 868 sources = [ | 904 sources = [ |
| 869 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.dylib", | 905 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.dylib", |
| 870 ] | 906 ] |
| 907 if (is_chrome_branded) { | |
| 908 sources += | |
| 909 [ "$root_out_dir/$widevine_cdm_path/libwidevinecdm.dylib.sig" ] | |
| 910 } | |
| 871 outputs = [ | 911 outputs = [ |
| 872 "$root_out_dir/{{source_file_part}}", | 912 "$root_out_dir/{{source_file_part}}", |
| 873 ] | 913 ] |
| 874 deps = [ | 914 deps = [ |
| 875 "//third_party/widevine/cdm:widevinecdm", | 915 "//third_party/widevine/cdm:widevinecdm", |
| 876 ] | 916 ] |
| 877 } | 917 } |
| 878 | 918 |
| 879 bundle_data("widevine_cdm_library_manifest") { | 919 bundle_data("widevine_cdm_library_manifest") { |
| 880 sources = [ | 920 sources = [ |
| 881 "$root_out_dir/WidevineCdm/manifest.json", | 921 "$root_out_dir/WidevineCdm/manifest.json", |
| 882 ] | 922 ] |
| 883 outputs = [ | 923 outputs = [ |
| 884 "{{bundle_root_dir}}/Libraries/WidevineCdm/{{source_file_part}}", | 924 "{{bundle_root_dir}}/Libraries/WidevineCdm/{{source_file_part}}", |
| 885 ] | 925 ] |
| 886 public_deps = [ | 926 public_deps = [ |
| 887 "//third_party/widevine/cdm:widevine_cdm_manifest", | 927 "//third_party/widevine/cdm:widevine_cdm_manifest", |
| 888 ] | 928 ] |
| 889 } | 929 } |
| 930 | |
| 931 widevine_sign_file("sign_cdm_adapter_for_widevine") { | |
| 932 file = "$root_out_dir/$widevine_cdm_path/widevinecdmadapter.plugin" | |
| 933 deps = [ | |
| 934 "//third_party/widevine/cdm:widevinecdmadapter", | |
| 935 ] | |
| 936 } | |
| 937 | |
| 938 widevine_sign_file("sign_chrome_framework_for_widevine") { | |
| 939 file = "$root_out_dir/$chrome_framework_name.framework/" | |
| 940 if (defined(chrome_framework_version)) { | |
| 941 file += "Versions/$chrome_framework_version/" | |
| 942 } | |
| 943 file += "$chrome_framework_name" | |
| 944 signature_file = "$root_out_dir/$chrome_framework_name.sig" | |
| 945 deps = [ | |
| 946 ":chrome_framework", | |
| 947 ] | |
| 948 } | |
| 890 } | 949 } |
| 891 | 950 |
| 892 group("widevine_cdm_library") { | 951 group("widevine_cdm_library") { |
| 893 if (_should_bundle_widevine) { | 952 if (_should_bundle_widevine) { |
| 894 deps = [ | 953 deps = [ |
| 895 ":widevine_cdm_library_binaries", | 954 ":widevine_cdm_library_binaries", |
| 896 ":widevine_cdm_library_manifest", | 955 ":widevine_cdm_library_manifest", |
| 897 ] | 956 ] |
| 898 } | 957 } |
| 899 } | 958 } |
| (...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1607 "//chrome/app/theme/$branding_path_component/product_logo_48.png", | 1666 "//chrome/app/theme/$branding_path_component/product_logo_48.png", |
| 1608 "//chrome/tools/build/linux/chrome-wrapper", | 1667 "//chrome/tools/build/linux/chrome-wrapper", |
| 1609 "//third_party/xdg-utils/scripts/xdg-mime", | 1668 "//third_party/xdg-utils/scripts/xdg-mime", |
| 1610 "//third_party/xdg-utils/scripts/xdg-settings", | 1669 "//third_party/xdg-utils/scripts/xdg-settings", |
| 1611 ] | 1670 ] |
| 1612 outputs = [ | 1671 outputs = [ |
| 1613 "$root_out_dir/{{source_file_part}}", | 1672 "$root_out_dir/{{source_file_part}}", |
| 1614 ] | 1673 ] |
| 1615 } | 1674 } |
| 1616 } | 1675 } |
| OLD | NEW |