[Revert] Hook up new rc.py.

Change-Id: I9d1bba8301eb2387277e53f3a0bee656a74c2491
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

6 files changed, 21 insertions, 15 deletions

diff --git a/chromium/build/toolchain/win/BUILD.gn b/chromium/build/toolchain/win/BUILD.gn
index be0893059aa..6c27755cead 100644
--- a/chromium/build/toolchain/win/BUILD.gn
+++ b/chromium/build/toolchain/win/BUILD.gn
@@ -224,8 +224,7 @@ template("msvc_toolchain") {
     }
 
     tool("rc") {
-      command = "$python_path $tool_wrapper_path rc-wrapper $env rc.exe /nologo $sys_include_flags{{defines}} {{include_dirs}} /fo{{output}} {{source}}"
-      depsformat = "msvc"
+      command = "$python_path $tool_wrapper_path rc-wrapper $env rc.exe /nologo {{defines}} {{include_dirs}} /fo{{output}} {{source}}"
       outputs = [ "$object_subdir/{{source_name_part}}.res" ]
       description = "RC {{output}}"
     }
diff --git a/chromium/build/toolchain/win/rc/rc.py b/chromium/build/toolchain/win/rc/rc.py
index 74761866eec..d30ca3e8da2 100755
--- a/chromium/build/toolchain/win/rc/rc.py
+++ b/chromium/build/toolchain/win/rc/rc.py
@@ -103,10 +103,10 @@ def ReadInput(input):
         rc_file_data = rc_file_data[2:].decode('utf-16le').encode('utf-8')
         is_utf8 = True
   except IOError:
-    print('rc.py: failed to open', input, file=sys.stderr)
+    print('failed to open', input, file=sys.stderr)
     sys.exit(1)
   except UnicodeDecodeError:
-    print('rc.py: failed to decode UTF-16 despite BOM', input, file=sys.stderr)
+    print('failed to decode UTF-16 despite BOM', input, file=sys.stderr)
     sys.exit(1)
   return rc_file_data, is_utf8
 
@@ -123,15 +123,12 @@ def Preprocess(rc_file_data, flags):
   # Closing temp_handle immediately defeats the purpose of mkstemp(), but I
   # can't figure out how to let write to the temp file on Windows otherwise.
   os.close(temp_handle)
-  clang_cmd = [clang, '/P', '/DRC_INVOKED', '/TC', '-', '/Fi' + temp_file]
-  if flags.imsvcs:
-    clang_cmd += ['/X']
+  clang_cmd = ([clang, '/P', '/DRC_INVOKED', '/TC', '-', '/Fi' + temp_file] +
+               flags.includes + flags.defines)
   if os.path.dirname(flags.input):
-    # This must precede flags.includes.
     clang_cmd.append('-I' + os.path.dirname(flags.input))
   if flags.show_includes:
     clang_cmd.append('/showIncludes')
-  clang_cmd += flags.imsvcs + flags.includes + flags.defines
   p = subprocess.Popen(clang_cmd, stdin=subprocess.PIPE)
   p.communicate(input=rc_file_data)
   if p.returncode != 0:
diff --git a/chromium/build/toolchain/win/tool_wrapper.py b/chromium/build/toolchain/win/tool_wrapper.py
index 5c1fb98108d..87e3521da83 100644
--- a/chromium/build/toolchain/win/tool_wrapper.py
+++ b/chromium/build/toolchain/win/tool_wrapper.py
@@ -164,13 +164,20 @@ class WinTool(object):
     return popen.returncode
 
   def ExecRcWrapper(self, arch, *args):
-    """Converts .rc files to .res files."""
+    """Filter logo banner from invocations of rc.exe. Older versions of RC
+    don't support the /nologo flag."""
     env = self._GetEnv(arch)
-    args = list(args)
-    rcpy_args = args[:]
-    rcpy_args[0:1] = [sys.executable, os.path.join(BASE_DIR, 'rc', 'rc.py')]
-    rcpy_args.append('/showIncludes')
-    return subprocess.call(rcpy_args, env=env)
+
+    popen = subprocess.Popen(args, shell=True, env=env,
+                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    out, _ = popen.communicate()
+    for line in out.splitlines():
+      if (not line.startswith('Microsoft (R) Windows (R) Resource Compiler') and
+          not line.startswith('Copy' + 'right (C' +
+                              ') Microsoft Corporation') and
+          line):
+        print(line)
+    return popen.returncode
 
   def ExecActionWrapper(self, arch, rspfile, *dirname):
     """Runs an action command line from a response file using the environment
diff --git a/chromium/chrome/installer/mini_installer/BUILD.gn b/chromium/chrome/installer/mini_installer/BUILD.gn
index a75484da690..2de503f2bbf 100644
--- a/chromium/chrome/installer/mini_installer/BUILD.gn
+++ b/chromium/chrome/installer/mini_installer/BUILD.gn
@@ -41,6 +41,7 @@ source_set("lib") {
     "mini_file.h",
     "mini_installer.cc",
     "mini_installer.h",
+    "mini_installer.ico",
     "mini_installer.rc",
     "mini_installer_constants.cc",
     "mini_installer_constants.h",
diff --git a/chromium/chrome/installer/setup/BUILD.gn b/chromium/chrome/installer/setup/BUILD.gn
index da78b2a843b..d8a99b27840 100644
--- a/chromium/chrome/installer/setup/BUILD.gn
+++ b/chromium/chrome/installer/setup/BUILD.gn
@@ -16,6 +16,7 @@ buildflag_header("buildflags") {
 if (is_win) {
   executable("setup") {
     sources = [
+      "setup.ico",
       "setup.rc",
       "setup_main.cc",
       "setup_main.h",
diff --git a/chromium/sandbox/win/BUILD.gn b/chromium/sandbox/win/BUILD.gn
index 93322374fb7..eed48278473 100644
--- a/chromium/sandbox/win/BUILD.gn
+++ b/chromium/sandbox/win/BUILD.gn
@@ -333,6 +333,7 @@ test("sandbox_poc") {
     "sandbox_poc/resource.h",
     "sandbox_poc/sandbox.cc",
     "sandbox_poc/sandbox.h",
+    "sandbox_poc/sandbox.ico",
     "sandbox_poc/sandbox.rc",
   ]