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

Unified Diff: chrome/chrome_installer.gypi

Issue 1062743006: Add installer_util_unittests to the GN windows build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wintests3
Patch Set: Fixes Created 5 years, 8 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
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/installer/setup/app_launcher_installer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_installer.gypi
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 52411a950bdc218abb8878862fa4bd953cb02ee6..d3d979abea53e5ba9268571b698d313185db9cd2 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -76,6 +76,7 @@
],
},
{
+ # GN version: //chrome/installer/util:installer_util_unittests
'target_name': 'installer_util_unittests',
'type': 'executable',
'dependencies': [
@@ -94,6 +95,7 @@
'..',
],
'sources': [
+ # List duplicated in GN build.
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'installer/setup/compat_checks_unittest.cc',
'installer/setup/setup_constants.cc',
@@ -160,6 +162,7 @@
'variables': {
'create_string_rc_py': 'installer/util/prebuild/create_string_rc.py',
'brand_strings': '<(branding_path_component)_strings',
+ 'gen_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util',
},
'inputs': [
@@ -167,20 +170,20 @@
'app/<(brand_strings).grd',
],
'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.h',
- '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
+ '<(gen_dir)/installer_util_strings.h',
+ '<(gen_dir)/installer_util_strings.rc',
],
'action': ['python',
'<(create_string_rc_py)',
'-i', 'app/<(brand_strings).grd:resources',
'-n', 'installer_util_strings',
- '-o', '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',],
+ '-o', '<(gen_dir)',],
'message': 'Generating installer_util_strings',
},
],
'direct_dependent_settings': {
'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',
+ '<(SHARED_INTERMEDIATE_DIR)',
],
},
},
@@ -228,7 +231,7 @@
],
},
'sources': [
- '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_strings.rc',
'installer/mini_installer/chrome.release',
'installer/setup/app_launcher_installer.cc',
'installer/setup/app_launcher_installer.h',
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/installer/setup/app_launcher_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698