diff options
| author | rickyz <rickyz@chromium.org> | 2015-04-30 14:55:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-30 21:56:21 +0000 |
| commit | b356c585d9f6841dcc7df05b8e7cfad0a2b4bdf6 (patch) | |
| tree | 600ee2cda53749188ccd29f80af44abd669f243a /chrome/installer/setup | |
| parent | f02f0cc4ee8f12e53cd57a97bd2d6ef4c3af87ff (diff) | |
| download | chromium_src-b356c585d9f6841dcc7df05b8e7cfad0a2b4bdf6.zip chromium_src-b356c585d9f6841dcc7df05b8e7cfad0a2b4bdf6.tar.gz chromium_src-b356c585d9f6841dcc7df05b8e7cfad0a2b4bdf6.tar.bz2 | |
Revert of Add installer_util_unittests to the GN windows build (patchset #5 id:80001 of https://codereview.chromium.org/1062743006/)
Reason for revert:
Compilation errors that look related to the installer_util_strings.rc move: http://build.chromium.org/p/chromium/builders/Win/builds/31460
Original issue's description:
> 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
>
> Committed: https://crrev.com/cb55755a09b9e2d8c5b05b7a4ad2ff8631e15b13
> Cr-Commit-Position: refs/heads/master@{#327790}
TBR=dpranke@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1116263002
Cr-Commit-Position: refs/heads/master@{#327799}
Diffstat (limited to 'chrome/installer/setup')
| -rw-r--r-- | chrome/installer/setup/app_launcher_installer.cc | 3 | ||||
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 3 | ||||
| -rw-r--r-- | chrome/installer/setup/setup_unittests.rc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/chrome/installer/setup/app_launcher_installer.cc b/chrome/installer/setup/app_launcher_installer.cc index 46670fa..3c30aaf 100644 --- a/chrome/installer/setup/app_launcher_installer.cc +++ b/chrome/installer/setup/app_launcher_installer.cc @@ -13,13 +13,14 @@ #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/installer_state.h" -#include "chrome/installer/util/installer_util_strings.h" #include "chrome/installer/util/l10n_string_util.h" #include "chrome/installer/util/product.h" #include "chrome/installer/util/updating_app_registration_data.h" #include "chrome/installer/util/work_item.h" #include "chrome/installer/util/work_item_list.h" +#include "installer_util_strings.h" // NOLINT + namespace installer { namespace { diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index d50aa1e..acc35d7 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -56,7 +56,6 @@ #include "chrome/installer/util/installation_state.h" #include "chrome/installer/util/installation_validator.h" #include "chrome/installer/util/installer_state.h" -#include "chrome/installer/util/installer_util_strings.h" #include "chrome/installer/util/l10n_string_util.h" #include "chrome/installer/util/logging_installer.h" #include "chrome/installer/util/lzma_util.h" @@ -66,6 +65,8 @@ #include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/user_experiment.h" +#include "installer_util_strings.h" // NOLINT + #if defined(GOOGLE_CHROME_BUILD) #include "chrome/installer/util/updating_app_registration_data.h" #endif diff --git a/chrome/installer/setup/setup_unittests.rc b/chrome/installer/setup/setup_unittests.rc index 4fd7dd5..67c1959 100644 --- a/chrome/installer/setup/setup_unittests.rc +++ b/chrome/installer/setup/setup_unittests.rc @@ -55,7 +55,7 @@ END // // String Table // -#include "chrome/installer/util/installer_util_strings.rc" +#include "installer_util_strings.rc" #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// |