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

Side by Side Diff: chrome/BUILD.gn

Issue 2353683003: [NaCl SDK] Re-enable 32-bit sel_ldr build for mac (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 | native_client_sdk/src/build_tools/build_sdk.py » ('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 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 807
808 if (enable_nacl) { 808 if (enable_nacl) {
809 bundle_data("chrome_framework_plugins") { 809 bundle_data("chrome_framework_plugins") {
810 sources = [] 810 sources = []
811 outputs = [ 811 outputs = [
812 "{{bundle_root_dir}}/Internet Plug-Ins/{{source_file_part}}", 812 "{{bundle_root_dir}}/Internet Plug-Ins/{{source_file_part}}",
813 ] 813 ]
814 public_deps = [] 814 public_deps = []
815 815
816 if (enable_nacl) { 816 if (enable_nacl) {
817 sources += [ "$root_out_dir/nacl_irt_x86_64.nexe" ] 817 if (current_cpu == "x86") {
818 sources += [ "$root_out_dir/nacl_irt_x86_32.nexe" ]
819 } else if (current_cpu == "x64") {
820 sources += [ "$root_out_dir/nacl_irt_x86_64.nexe" ]
821 }
818 public_deps += [ "//ppapi/native_client:irt" ] 822 public_deps += [ "//ppapi/native_client:irt" ]
819 } 823 }
820 } 824 }
821 } else { 825 } else {
822 group("chrome_framework_plugins") { 826 group("chrome_framework_plugins") {
823 } 827 }
824 } 828 }
825 829
826 _should_bundle_widevine = 830 _should_bundle_widevine =
827 (is_chrome_branded || enable_widevine) && enable_pepper_cdms 831 (is_chrome_branded || enable_widevine) && enable_pepper_cdms
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
1582 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1586 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1583 "//chrome/tools/build/linux/chrome-wrapper", 1587 "//chrome/tools/build/linux/chrome-wrapper",
1584 "//third_party/xdg-utils/scripts/xdg-mime", 1588 "//third_party/xdg-utils/scripts/xdg-mime",
1585 "//third_party/xdg-utils/scripts/xdg-settings", 1589 "//third_party/xdg-utils/scripts/xdg-settings",
1586 ] 1590 ]
1587 outputs = [ 1591 outputs = [
1588 "$root_out_dir/{{source_file_part}}", 1592 "$root_out_dir/{{source_file_part}}",
1589 ] 1593 ]
1590 } 1594 }
1591 } 1595 }
OLDNEW
« no previous file with comments | « no previous file | native_client_sdk/src/build_tools/build_sdk.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698