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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: testing/iossim/iossim.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 side-by-side diff with in-line comments
Download patch
« build/common.gypi ('K') | « ios/chrome/tools/strings/generate_localizable_strings.gyp ('k') | third_party/protobuf/protobuf.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/iossim/iossim.gyp
diff --git a/testing/iossim/iossim.gyp b/testing/iossim/iossim.gyp
index 88069b6d0de36550d62b5603d133622ead49c498..2b30b18106ebf96f3ee004599e642a4c44a12887 100644
--- a/testing/iossim/iossim.gyp
+++ b/testing/iossim/iossim.gyp
@@ -9,134 +9,98 @@
'class_dump_bin': '<(PRODUCT_DIR)/class-dump',
'class_dump_py': '<(DEPTH)/third_party/class-dump/class-dump.py',
},
- 'conditions': [
- ['OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', {
- 'targets': [
+ 'targets': [
+ {
+ # GN version //testing/iossim(//build/toolchain/mac:clang_x64)
+ 'target_name': 'iossim',
+ 'toolsets': ['host'],
+ 'type': 'executable',
+ 'variables': {
+ 'developer_dir': '<!(xcode-select -print-path)',
+ 'iphone_sim_path': '<(developer_dir)/../SharedFrameworks',
+ },
+ 'dependencies': [
+ '<(DEPTH)/third_party/class-dump/class-dump.gyp:class-dump#host',
+ ],
+ 'include_dirs': [
+ '<(INTERMEDIATE_DIR)/iossim',
+ ],
+ 'sources': [
+ 'iossim.mm',
+ '<(INTERMEDIATE_DIR)/iossim/iPhoneSimulatorRemoteClient.h',
+ ],
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+ ],
+ 'actions': [
{
- # GN version //testing/iossim(//build/toolchain/mac:clang_x64)
- 'target_name': 'iossim',
- 'toolsets': ['host'],
- 'type': 'executable',
- 'variables': {
- 'developer_dir': '<!(xcode-select -print-path)',
- 'iphone_sim_path': '<(developer_dir)/../SharedFrameworks',
- },
- 'dependencies': [
- '<(DEPTH)/third_party/class-dump/class-dump.gyp:class-dump#host',
+ 'action_name': 'generate_dvt_core_simulator',
+ 'inputs': [
+ '<(class_dump_bin)',
+ '<(class_dump_py)',
+ '<(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework/Versions/Current/CoreSimulator',
+ ],
+ 'outputs': [
+ '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h'
],
- 'include_dirs': [
- '<(INTERMEDIATE_DIR)/iossim',
+ 'action': [
+ 'python',
+ '<(class_dump_py)',
+ '-t', '<(class_dump_bin)',
+ '-o', '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h',
+ '--',
+ '-CSim',
+ '<(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework',
],
- 'sources': [
- 'iossim.mm',
- '<(INTERMEDIATE_DIR)/iossim/iPhoneSimulatorRemoteClient.h',
+ 'message': 'Generating CoreSimulator.h',
+ },
+ {
+ 'action_name': 'generate_dvt_foundation_header',
+ 'inputs': [
+ '<(class_dump_bin)',
+ '<(class_dump_py)',
+ '<(iphone_sim_path)/DVTFoundation.framework/Versions/Current/DVTFoundation',
],
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+ 'outputs': [
+ '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h'
],
- 'actions': [
- {
- 'action_name': 'generate_dvt_core_simulator',
- 'inputs': [
- '<(class_dump_bin)',
- '<(class_dump_py)',
- '<(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework/Versions/Current/CoreSimulator',
- ],
- 'outputs': [
- '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h'
- ],
- 'action': [
- 'python',
- '<(class_dump_py)',
- '-t', '<(class_dump_bin)',
- '-o', '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h',
- '--',
- '-CSim',
- '<(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework',
- ],
- 'message': 'Generating CoreSimulator.h',
- },
- {
- 'action_name': 'generate_dvt_foundation_header',
- 'inputs': [
- '<(class_dump_bin)',
- '<(class_dump_py)',
- '<(iphone_sim_path)/DVTFoundation.framework/Versions/Current/DVTFoundation',
- ],
- 'outputs': [
- '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h'
- ],
- 'action': [
- 'python',
- '<(class_dump_py)',
- '-t', '<(class_dump_bin)',
- '-o', '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h',
- '--',
- '-CDVTStackBacktrace|DVTInvalidation|DVTMixIn',
- '<(iphone_sim_path)/DVTFoundation.framework',
- ],
- 'message': 'Generating DVTFoundation.h',
- },
- {
- 'action_name': 'generate_dvt_iphone_sim_header',
- 'inputs': [
- '<(class_dump_bin)',
- '<(class_dump_py)',
- '<(iphone_sim_path)/DVTiPhoneSimulatorRemoteClient.framework/Versions/Current/DVTiPhoneSimulatorRemoteClient',
- ],
- 'outputs': [
- '<(INTERMEDIATE_DIR)/iossim/DVTiPhoneSimulatorRemoteClient.h'
- ],
- 'action': [
- 'python',
- '<(class_dump_py)',
- '-t', '<(class_dump_bin)',
- '-o', '<(INTERMEDIATE_DIR)/iossim/DVTiPhoneSimulatorRemoteClient.h',
- '--',
- '-I',
- '-CiPhoneSimulator',
- '<(iphone_sim_path)/DVTiPhoneSimulatorRemoteClient.framework',
- ],
- 'message': 'Generating DVTiPhoneSimulatorRemoteClient.h',
- },
- ], # actions
- 'xcode_settings': {
- 'ARCHS': ['x86_64'],
- },
+ 'action': [
+ 'python',
+ '<(class_dump_py)',
+ '-t', '<(class_dump_bin)',
+ '-o', '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h',
+ '--',
+ '-CDVTStackBacktrace|DVTInvalidation|DVTMixIn',
+ '<(iphone_sim_path)/DVTFoundation.framework',
+ ],
+ 'message': 'Generating DVTFoundation.h',
},
- ],
- }, { # else, OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)"!="ninja"
- 'variables': {
- 'ninja_output_dir': 'ninja-iossim',
- 'ninja_product_dir':
- '$(SYMROOT)/<(ninja_output_dir)/<(CONFIGURATION_NAME)',
- },
- 'targets': [
{
- 'target_name': 'iossim',
- 'type': 'none',
- 'toolsets': ['host'],
- 'variables': {
- # Gyp to rerun
- 're_run_targets': [
- 'testing/iossim/iossim.gyp',
- ],
- },
- 'includes': ['../../build/ios/mac_build.gypi'],
- 'actions': [
- {
- 'action_name': 'compile iossim',
- 'inputs': [],
- 'outputs': [],
- 'action': [
- '<@(ninja_cmd)',
- 'iossim',
- ],
- 'message': 'Generating the iossim executable',
- },
+ 'action_name': 'generate_dvt_iphone_sim_header',
+ 'inputs': [
+ '<(class_dump_bin)',
+ '<(class_dump_py)',
+ '<(iphone_sim_path)/DVTiPhoneSimulatorRemoteClient.framework/Versions/Current/DVTiPhoneSimulatorRemoteClient',
],
+ 'outputs': [
+ '<(INTERMEDIATE_DIR)/iossim/DVTiPhoneSimulatorRemoteClient.h'
+ ],
+ 'action': [
+ 'python',
+ '<(class_dump_py)',
+ '-t', '<(class_dump_bin)',
+ '-o', '<(INTERMEDIATE_DIR)/iossim/DVTiPhoneSimulatorRemoteClient.h',
+ '--',
+ '-I',
+ '-CiPhoneSimulator',
+ '<(iphone_sim_path)/DVTiPhoneSimulatorRemoteClient.framework',
+ ],
+ 'message': 'Generating DVTiPhoneSimulatorRemoteClient.h',
},
- ],
- }],
+ ], # actions
+ 'xcode_settings': {
+ 'ARCHS': ['x86_64'],
+ },
+ },
],
}
« build/common.gypi ('K') | « ios/chrome/tools/strings/generate_localizable_strings.gyp ('k') | third_party/protobuf/protobuf.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698