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

Side by Side Diff: chrome/BUILD.gn

Issue 2273883002: Unbundle Flash on OSX. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | no next file » | 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 public_deps += [ 254 public_deps += [
255 ":packed_extra_resources", 255 ":packed_extra_resources",
256 ":packed_resources", 256 ":packed_resources",
257 ] 257 ]
258 deps += [ 258 deps += [
259 "//components/startup_metric_utils/browser:lib", 259 "//components/startup_metric_utils/browser:lib",
260 260
261 # Precompiled plugins that need to get copied to the output directory. 261 # Precompiled plugins that need to get copied to the output directory.
262 # On Mac, internal plugins go inside the framework, so these 262 # On Mac, internal plugins go inside the framework, so these
263 # dependencies are on chrome.dll. 263 # dependencies are on chrome.dll.
264 "//third_party/adobe/flash:flapper_binaries", 264 "//third_party/adobe/flash:flapper_binaries",
Nico 2016/08/24 16:10:02 can this go away on mac now too?
waffles 2016/08/24 19:24:13 I think this is already inside the !is_mac startin
265 ] 265 ]
266 266
267 data_deps += [ "//third_party/widevine/cdm:widevinecdmadapter" ] 267 data_deps += [ "//third_party/widevine/cdm:widevinecdmadapter" ]
268 268
269 if (is_multi_dll_chrome) { 269 if (is_multi_dll_chrome) {
270 defines += [ "CHROME_MULTIPLE_DLL" ] 270 defines += [ "CHROME_MULTIPLE_DLL" ]
271 data_deps += [ ":chrome_child" ] 271 data_deps += [ ":chrome_child" ]
272 } 272 }
273 } 273 }
274 } # !is_android && !is_mac 274 } # !is_android && !is_mac
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 sources += [ "$root_out_dir/nacl_irt_x86_64.nexe" ] 834 sources += [ "$root_out_dir/nacl_irt_x86_64.nexe" ]
835 public_deps += [ "//ppapi/native_client:irt" ] 835 public_deps += [ "//ppapi/native_client:irt" ]
836 } 836 }
837 } 837 }
838 } else { 838 } else {
839 group("chrome_framework_plugins") { 839 group("chrome_framework_plugins") {
840 } 840 }
841 } 841 }
842 842
843 if (is_chrome_branded) { 843 if (is_chrome_branded) {
844 bundle_data("flash_player_plugin") {
845 sources = [
846 "$root_out_dir/PepperFlash/PepperFlashPlayer.plugin",
847 "$root_out_dir/PepperFlash/manifest.json",
848 ]
849 outputs = [
850 "{{bundle_root_dir}}/Internet Plug-Ins/PepperFlash/{{source_file_part}}" ,
851 ]
852 public_deps = [
853 "//third_party/adobe/flash:flapper_binaries",
854 ]
855 }
856
857 bundle_data("widevine_cdm_library_binaries") { 844 bundle_data("widevine_cdm_library_binaries") {
858 sources = [ 845 sources = [
859 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.dylib", 846 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.dylib",
860 "$root_out_dir/$widevine_cdm_path/widevinecdmadapter.plugin", 847 "$root_out_dir/$widevine_cdm_path/widevinecdmadapter.plugin",
861 ] 848 ]
862 outputs = [ 849 outputs = [
863 "{{bundle_root_dir}}/Libraries/$widevine_cdm_path/{{source_file_part}}", 850 "{{bundle_root_dir}}/Libraries/$widevine_cdm_path/{{source_file_part}}",
864 ] 851 ]
865 public_deps = [ 852 public_deps = [
866 "//third_party/widevine/cdm:widevinecdm", 853 "//third_party/widevine/cdm:widevinecdm",
867 "//third_party/widevine/cdm:widevinecdmadapter", 854 "//third_party/widevine/cdm:widevinecdmadapter",
868 ] 855 ]
869 } 856 }
870 857
871 bundle_data("widevine_cdm_library_manifest") { 858 bundle_data("widevine_cdm_library_manifest") {
872 sources = [ 859 sources = [
873 "$root_out_dir/WidevineCdm/manifest.json", 860 "$root_out_dir/WidevineCdm/manifest.json",
874 ] 861 ]
875 outputs = [ 862 outputs = [
876 "{{bundle_root_dir}}/Libraries/WidevineCdm/{{source_file_part}}", 863 "{{bundle_root_dir}}/Libraries/WidevineCdm/{{source_file_part}}",
877 ] 864 ]
878 public_deps = [ 865 public_deps = [
879 "//third_party/widevine/cdm:widevine_cdm_manifest", 866 "//third_party/widevine/cdm:widevine_cdm_manifest",
880 ] 867 ]
881 } 868 }
882 } else {
883 group("flash_player_plugin") {
884 }
885 } 869 }
886 870
887 group("widevine_cdm_library") { 871 group("widevine_cdm_library") {
888 if (is_chrome_branded) { 872 if (is_chrome_branded) {
889 deps = [ 873 deps = [
890 ":widevine_cdm_library_binaries", 874 ":widevine_cdm_library_binaries",
891 ":widevine_cdm_library_manifest", 875 ":widevine_cdm_library_manifest",
892 ] 876 ]
893 } 877 }
894 } 878 }
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 986
1003 public_deps = [ 987 public_deps = [
1004 ":chrome_dll", 988 ":chrome_dll",
1005 ] 989 ]
1006 990
1007 deps = [ 991 deps = [
1008 ":chrome_framework_helpers", 992 ":chrome_framework_helpers",
1009 ":chrome_framework_locales", 993 ":chrome_framework_locales",
1010 ":chrome_framework_plugins", 994 ":chrome_framework_plugins",
1011 ":chrome_framework_resources", 995 ":chrome_framework_resources",
1012 ":flash_player_plugin",
1013 ":widevine_cdm_library", 996 ":widevine_cdm_library",
1014 "//build/config/sanitizers:deps", 997 "//build/config/sanitizers:deps",
1015 "//chrome/app/nibs:chrome_xibs", 998 "//chrome/app/nibs:chrome_xibs",
1016 ] 999 ]
1017 1000
1018 if (is_chrome_branded) { 1001 if (is_chrome_branded) {
1019 deps += [ ":default_apps" ] 1002 deps += [ ":default_apps" ]
1020 } 1003 }
1021 1004
1022 ldflags = [ 1005 ldflags = [
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
1766 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1749 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1767 "//chrome/tools/build/linux/chrome-wrapper", 1750 "//chrome/tools/build/linux/chrome-wrapper",
1768 "//third_party/xdg-utils/scripts/xdg-mime", 1751 "//third_party/xdg-utils/scripts/xdg-mime",
1769 "//third_party/xdg-utils/scripts/xdg-settings", 1752 "//third_party/xdg-utils/scripts/xdg-settings",
1770 ] 1753 ]
1771 outputs = [ 1754 outputs = [
1772 "$root_out_dir/{{source_file_part}}", 1755 "$root_out_dir/{{source_file_part}}",
1773 ] 1756 ]
1774 } 1757 }
1775 } 1758 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698