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

Side by Side Diff: breakpad/breakpad.gyp

Issue 2066533002: gyp: <(GENERATOR) is now always ninja, so simplify some conditionals. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | build/common.gypi » ('j') | build/common.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'includes': [ 6 'includes': [
7 'breakpad_sender.gypi', 7 'breakpad_sender.gypi',
8 'breakpad_handler.gypi', 8 'breakpad_handler.gypi',
9 ], 9 ],
10 'conditions': [ 10 'conditions': [
11 # minidump_stackwalk and minidump_dump are tool-type executables that do 11 ['OS!="win"', {
12 # not build on iOS with Xcode (but do build on iOS with ninja.)
13 ['(OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja") a nd OS!="win"', {
14 'targets': [ 12 'targets': [
15 { 13 {
16 # code shared by both {micro,mini}dump_stackwalk 14 # code shared by both {micro,mini}dump_stackwalk
17 # GN version: //breakpad:stackwalk_common 15 # GN version: //breakpad:stackwalk_common
18 'target_name': 'stackwalk_common', 16 'target_name': 'stackwalk_common',
19 'type': 'static_library', 17 'type': 'static_library',
20 'includes': ['breakpad_tools.gypi'], 18 'includes': ['breakpad_tools.gypi'],
21 'defines': ['BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR'], 19 'defines': ['BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR'],
22 'sources': [ 20 'sources': [
23 'src/processor/basic_code_module.h', 21 'src/processor/basic_code_module.h',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 'src/processor/proc_maps_linux.cc', 157 'src/processor/proc_maps_linux.cc',
160 ], 158 ],
161 'conditions': [ 159 'conditions': [
162 ['OS=="ios"', { 160 ['OS=="ios"', {
163 'toolsets': ['host'], 161 'toolsets': ['host'],
164 }], 162 }],
165 ], 163 ],
166 }, 164 },
167 ], 165 ],
168 }], 166 }],
169 ['OS=="mac" or (OS=="ios" and ("<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVO R)"=="ninja"))', { 167 ['OS=="mac" or OS=="ios"', {
170 'target_defaults': { 168 'target_defaults': {
171 'include_dirs': [ 169 'include_dirs': [
172 'src', 170 'src',
173 ], 171 ],
174 'configurations': { 172 'configurations': {
175 'Debug_Base': { 173 'Debug_Base': {
176 'defines': [ 174 'defines': [
177 # This is needed for GTMLogger to work correctly. 175 # This is needed for GTMLogger to work correctly.
178 'DEBUG', 176 'DEBUG',
179 ], 177 ],
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 'xcode_settings' : { 887 'xcode_settings' : {
890 'WARNING_CFLAGS': [ 888 'WARNING_CFLAGS': [
891 # See https://bugs.chromium.org/p/google-breakpad/issues/detail?id =675. 889 # See https://bugs.chromium.org/p/google-breakpad/issues/detail?id =675.
892 # TODO(crbug.com/569158): remove when fixed. 890 # TODO(crbug.com/569158): remove when fixed.
893 '-Wno-deprecated-declarations', 891 '-Wno-deprecated-declarations',
894 ], 892 ],
895 }, 893 },
896 } 894 }
897 ] 895 ]
898 }], 896 }],
899 ['OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)"!="ninja"', {
900 'variables': {
901 'ninja_output_dir': 'ninja-breakpad',
902 'ninja_product_dir':
903 '<(DEPTH)/xcodebuild/<(ninja_output_dir)/<(CONFIGURATION_NAME)',
904 },
905 # Generation is done via two actions: (1) compiling the executable with
906 # ninja, and (2) copying the executable into a location that is shared
907 # with other projects. These actions are separated into two targets in
908 # order to be able to specify that the second action should not run until
909 # the first action finishes (since the ordering of multiple actions in
910 # one target is defined only by inputs and outputs, and it's impossible
911 # to set correct inputs for the ninja build, so setting all the inputs
912 # and outputs isn't an option).
913 'targets': [
914 {
915 'target_name': 'compile_breakpad_utilities',
916 'type': 'none',
917 'variables': {
918 # Gyp to rerun
919 're_run_targets': [
920 'breakpad/breakpad.gyp',
921 ],
922 },
923 'includes': ['../build/ios/mac_build.gypi'],
924 'actions': [
925 {
926 'action_name': 'compile breakpad utilities',
927 'inputs': [],
928 'outputs': [],
929 'action': [
930 '<@(ninja_cmd)',
931 'dump_syms',
932 'symupload',
933 ],
934 'message': 'Generating the breakpad executables',
935 },
936 ],
937 },
938 {
939 'target_name': 'breakpad_utilities',
940 'type': 'none',
941 'dependencies': [
942 'compile_breakpad_utilities',
943 ],
944 'actions': [
945 {
946 'action_name': 'copy dump_syms',
947 'inputs': [
948 '<(ninja_product_dir)/dump_syms',
949 ],
950 'outputs': [
951 '<(PRODUCT_DIR)/dump_syms',
952 ],
953 'action': [
954 'cp',
955 '<(ninja_product_dir)/dump_syms',
956 '<(PRODUCT_DIR)/dump_syms',
957 ],
958 },
959 {
960 'action_name': 'copy symupload',
961 'inputs': [
962 '<(ninja_product_dir)/symupload',
963 ],
964 'outputs': [
965 '<(PRODUCT_DIR)/symupload',
966 ],
967 'action': [
968 'cp',
969 '<(ninja_product_dir)/symupload',
970 '<(PRODUCT_DIR)/symupload',
971 ],
972 },
973 ],
974 },
975 {
976 'target_name': 'dump_syms',
977 'type': 'none',
978 'dependencies': [
979 'breakpad_utilities',
980 ],
981 },
982 {
983 'target_name': 'symupload',
984 'type': 'none',
985 'dependencies': [
986 'breakpad_utilities',
987 ],
988 }
989 ],
990 }],
991 ['OS=="android"', { 897 ['OS=="android"', {
992 'targets': [ 898 'targets': [
993 { 899 {
994 'target_name': 'breakpad_unittests_stripped', 900 'target_name': 'breakpad_unittests_stripped',
995 'type': 'none', 901 'type': 'none',
996 'dependencies': [ 'breakpad_unittests' ], 902 'dependencies': [ 'breakpad_unittests' ],
997 'actions': [{ 903 'actions': [{
998 'action_name': 'strip breakpad_unittests', 904 'action_name': 'strip breakpad_unittests',
999 'inputs': [ '<(PRODUCT_DIR)/breakpad_unittests' ], 905 'inputs': [ '<(PRODUCT_DIR)/breakpad_unittests' ],
1000 'outputs': [ '<(PRODUCT_DIR)/breakpad_unittests_stripped' ], 906 'outputs': [ '<(PRODUCT_DIR)/breakpad_unittests_stripped' ],
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
1036 'breakpad_unittests_apk.isolate', 942 'breakpad_unittests_apk.isolate',
1037 ], 943 ],
1038 }, 944 },
1039 ] 945 ]
1040 } 946 }
1041 ], 947 ],
1042 ], 948 ],
1043 }], 949 }],
1044 ], 950 ],
1045 } 951 }
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698