summaryrefslogtreecommitdiffstats
path: root/chrome/installer/upgrade_test.gyp
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-04-30 14:12:14 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-30 21:12:50 +0000
commitcb55755a09b9e2d8c5b05b7a4ad2ff8631e15b13 (patch)
treea923c6439926430dcfb9478c1e0310a77e301cb7 /chrome/installer/upgrade_test.gyp
parent5ba44908beefb6aac6ace9608458c6d156b194c1 (diff)
downloadchromium_src-cb55755a09b9e2d8c5b05b7a4ad2ff8631e15b13.zip
chromium_src-cb55755a09b9e2d8c5b05b7a4ad2ff8631e15b13.tar.gz
chromium_src-cb55755a09b9e2d8c5b05b7a4ad2ff8631e15b13.tar.bz2
Add installer_util_unittests to the GN windows build
This fixes some C++ Warnings on Windows to avoid having to add suppressions to the GN build. Moves the generated strings header to the same place in the gen tree as it is in the source tree. Update includes. CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg Review URL: https://codereview.chromium.org/1062743006 Cr-Commit-Position: refs/heads/master@{#327790}
Diffstat (limited to 'chrome/installer/upgrade_test.gyp')
-rw-r--r--chrome/installer/upgrade_test.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/installer/upgrade_test.gyp b/chrome/installer/upgrade_test.gyp
index bccc94d..07b283e 100644
--- a/chrome/installer/upgrade_test.gyp
+++ b/chrome/installer/upgrade_test.gyp
@@ -19,6 +19,7 @@
['OS=="win"', {
'targets': [
{
+ # GN version: //chrome/installer/test:alternate_version_generator_lib
'target_name': 'alternate_version_generator_lib',
'type': 'static_library',
'dependencies': [
@@ -43,6 +44,7 @@
'msvs_disabled_warnings': [4267, ],
},
{
+ # GN version: //chrome/installer/test:upgrade_test
'target_name': 'upgrade_test',
'type': 'executable',
'dependencies': [
@@ -68,6 +70,7 @@
],
},
{
+ # GN version: //chrome/installer/test:alternate_version_generator
'target_name': 'alternate_version_generator',
'type': 'executable',
'dependencies': [