summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-05-05 12:43:04 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-05 19:44:01 +0000
commit51d04a1d341fe739beaff1528095f025a66f3fcc (patch)
treef96b54edeaa51447ef49dcdc057747b346fdbc7a /chrome/installer/util
parent7bd00a274893ee7334dfbc78ca5046f1af876382 (diff)
downloadchromium_src-51d04a1d341fe739beaff1528095f025a66f3fcc.zip
chromium_src-51d04a1d341fe739beaff1528095f025a66f3fcc.tar.gz
chromium_src-51d04a1d341fe739beaff1528095f025a66f3fcc.tar.bz2
GN Windows component build fixes
The main thing this fixes is the midi component. Previously midi_unittests was never compiled on any Windows component bot and the component build was all messed up. This patch makes the component build work correctly for this component. Remove installer_util_unittests.rc and its header. These seem to be autogenerated Visual Studio files. They just include the strings resource file, but GN includes the strings resource file itself by nature of the dependencies (GYP doesn't do this). 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 BUG=470212 Review URL: https://codereview.chromium.org/1121363002 Cr-Commit-Position: refs/heads/master@{#328383}
Diffstat (limited to 'chrome/installer/util')
-rw-r--r--chrome/installer/util/BUILD.gn2
-rw-r--r--chrome/installer/util/installer_util_unittests.rc72
-rw-r--r--chrome/installer/util/installer_util_unittests_resource.h18
3 files changed, 0 insertions, 92 deletions
diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn
index e923633..3e7da02 100644
--- a/chrome/installer/util/BUILD.gn
+++ b/chrome/installer/util/BUILD.gn
@@ -233,8 +233,6 @@ if (is_win) {
"installer_state_unittest.cc",
"installer_util_test_common.cc",
"installer_util_test_common.h",
- "installer_util_unittests.rc",
- "installer_util_unittests_resource.h",
"language_selector_unittest.cc",
"legacy_firewall_manager_win_unittest.cc",
"logging_installer_unittest.cc",
diff --git a/chrome/installer/util/installer_util_unittests.rc b/chrome/installer/util/installer_util_unittests.rc
deleted file mode 100644
index 0c58eb8..0000000
--- a/chrome/installer/util/installer_util_unittests.rc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "installer_util_unittests_resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE 9, 1
-#pragma code_page(1252)
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
- "#include ""windows.h""\r\n"
- "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-#include "chrome/installer/util/installer_util_strings.rc"
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/chrome/installer/util/installer_util_unittests_resource.h b/chrome/installer/util/installer_util_unittests_resource.h
deleted file mode 100644
index 55b9bd0..0000000
--- a/chrome/installer/util/installer_util_unittests_resource.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by installer_util_unittests.rc
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif