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

Issue 12092117: Merged all Chromoting Host code into remoting_core.dll (Windows). (Closed)

Created:
7 years, 10 months ago by alexeypa (please no reviews)
Modified:
7 years, 10 months ago
Reviewers:
Sergey Ulanov, scottmg
CC:
chromium-reviews, jamiewalch+watch_chromium.org, dcaiafa+watch_chromium.org, simonmorris+watch_chromium.org, hclam+watch_chromium.org, wez+watch_chromium.org, amit, sanjeevr, garykac+watch_chromium.org, lambroslambrou+watch_chromium.org, rmsousa+watch_chromium.org, alexeypa+watch_chromium.org, sergeyu+watch_chromium.org
Visibility:
Public.

Description

Merged all Chromoting Host code into remoting_core.dll (Windows). Consolidated all installable Chromoting Host core into remoting_core.dll and converted all executables into thin wrappers around entry points exposed by remoting_core.dll. This reduces size of the installer by approximately 600KB. This is the 3rd attempt to land this CL. The previous attempt was reverted at r179373 because ninja sometimes failed to create a manifest for targets that use manifestXXX linker flags. This CL fixes that by manually embedding the manifests into binaries. BUG=170200, 173052 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=180433

Patch Set 1 #

Patch Set 2 : Embedd manifests regardless of the used build system. #

Total comments: 2

Patch Set 3 : CR feedback. #

Patch Set 4 : rebased #

Unified diffs Side-by-side diffs Delta from patch set Stats (+783 lines, -784 lines) Patch
M build/some.gyp View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M remoting/branding_Chrome View 1 chunk +1 line, -0 lines 0 comments Download
M remoting/branding_Chromium View 1 chunk +1 line, -0 lines 0 comments Download
M remoting/host/continue_window_win.cc View 2 chunks +5 lines, -8 lines 0 comments Download
A remoting/host/desktop_process_main.h View 1 chunk +17 lines, -0 lines 0 comments Download
M remoting/host/desktop_process_main.cc View 1 2 3 5 chunks +50 lines, -46 lines 0 comments Download
M remoting/host/disconnect_window_win.cc View 1 chunk +1 line, -1 line 0 comments Download
A remoting/host/host_export.h View 1 chunk +24 lines, -0 lines 0 comments Download
D remoting/host/host_ui.rc View 1 chunk +0 lines, -100 lines 0 comments Download
D remoting/host/host_ui_resource.h View 1 chunk +0 lines, -27 lines 0 comments Download
M remoting/host/installer/win/chromoting.wxs View 8 chunks +25 lines, -14 lines 0 comments Download
M remoting/host/installer/win/parameters.json View 1 chunk +1 line, -0 lines 0 comments Download
M remoting/host/plugin/host_plugin.cc View 1 chunk +0 lines, -3 lines 0 comments Download
D remoting/host/remoting_desktop.ver View 1 chunk +0 lines, -4 lines 0 comments Download
D remoting/host/remoting_host_me2me.ver View 1 chunk +0 lines, -4 lines 0 comments Download
A remoting/host/remoting_me2me_host.h View 1 chunk +17 lines, -0 lines 0 comments Download
M remoting/host/remoting_me2me_host.cc View 1 2 3 7 chunks +46 lines, -58 lines 0 comments Download
M remoting/host/verify_config_window_win.h View 1 chunk +1 line, -1 line 0 comments Download
M remoting/host/verify_config_window_win.cc View 1 chunk +1 line, -1 line 0 comments Download
M remoting/host/video_scheduler.cc View 1 chunk +1 line, -1 line 0 comments Download
A remoting/host/win/core.cc View 1 chunk +14 lines, -0 lines 0 comments Download
A + remoting/host/win/core.rc View 3 chunks +32 lines, -42 lines 0 comments Download
A + remoting/host/win/core_resource.h View 2 chunks +19 lines, -4 lines 0 comments Download
A remoting/host/win/daemon_process_entry_point.cc View 1 chunk +14 lines, -0 lines 0 comments Download
A remoting/host/win/daemon_process_main.h View 1 chunk +17 lines, -0 lines 0 comments Download
A remoting/host/win/daemon_process_main.cc View 1 chunk +89 lines, -0 lines 0 comments Download
A remoting/host/win/desktop_process_entry_point.cc View 1 chunk +14 lines, -0 lines 0 comments Download
M remoting/host/win/elevated_controller.cc View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
D remoting/host/win/elevated_controller.rc View 1 chunk +0 lines, -69 lines 0 comments Download
A remoting/host/win/elevated_controller_entry_point.cc View 1 chunk +14 lines, -0 lines 0 comments Download
A remoting/host/win/elevated_controller_module.h View 1 chunk +17 lines, -0 lines 0 comments Download
M remoting/host/win/elevated_controller_module.cc View 4 chunks +10 lines, -12 lines 0 comments Download
D remoting/host/win/elevated_controller_resource.h View 1 chunk +0 lines, -19 lines 0 comments Download
A remoting/host/win/host_process_entry_point.cc View 1 chunk +14 lines, -0 lines 0 comments Download
M remoting/host/win/host_service.cc View 1 2 3 5 chunks +1 line, -62 lines 0 comments Download
D remoting/host/win/host_service.rc View 1 chunk +0 lines, -80 lines 0 comments Download
D remoting/host/win/host_service_resource.h View 1 chunk +0 lines, -21 lines 0 comments Download
A + remoting/host/win/remoting_core.manifest View 1 2 1 chunk +8 lines, -8 lines 0 comments Download
A remoting/host/win/remoting_core.ver View 1 chunk +4 lines, -0 lines 0 comments Download
A remoting/host/win/remoting_desktop.manifest View 1 2 1 chunk +10 lines, -0 lines 0 comments Download
A + remoting/host/win/remoting_desktop.ver View 0 chunks +-1 lines, --1 lines 0 comments Download
A remoting/host/win/remoting_host.manifest View 1 2 1 chunk +10 lines, -0 lines 0 comments Download
A + remoting/host/win/remoting_host.ver View 0 chunks +-1 lines, --1 lines 0 comments Download
M remoting/remoting.gyp View 1 2 3 19 chunks +302 lines, -200 lines 0 comments Download
M remoting/version.rc.version View 2 chunks +3 lines, -0 lines 0 comments Download

Messages

Total messages: 6 (0 generated)
alexeypa (please no reviews)
scottmg@ - PTAL at the patch set #2. sergeyu@ - please rubber stamp re-landing of ...
7 years, 10 months ago (2013-02-01 19:12:16 UTC) #1
scottmg
yuck :/ lgtm
7 years, 10 months ago (2013-02-01 19:21:21 UTC) #2
Sergey Ulanov
LGTM https://chromiumcodereview.appspot.com/12092117/diff/2001/remoting/host/win/remoting_desktop.manifest File remoting/host/win/remoting_desktop.manifest (right): https://chromiumcodereview.appspot.com/12092117/diff/2001/remoting/host/win/remoting_desktop.manifest#newcode6 remoting/host/win/remoting_desktop.manifest:6: <requestedExecutionLevel level="requireAdministrator" uiAccess="true"></requestedExecutionLevel> nit: How is this file ...
7 years, 10 months ago (2013-02-01 20:14:12 UTC) #3
alexeypa (please no reviews)
https://chromiumcodereview.appspot.com/12092117/diff/2001/remoting/host/win/remoting_desktop.manifest File remoting/host/win/remoting_desktop.manifest (right): https://chromiumcodereview.appspot.com/12092117/diff/2001/remoting/host/win/remoting_desktop.manifest#newcode6 remoting/host/win/remoting_desktop.manifest:6: <requestedExecutionLevel level="requireAdministrator" uiAccess="true"></requestedExecutionLevel> On 2013/02/01 20:14:12, sergeyu wrote: > ...
7 years, 10 months ago (2013-02-01 21:09:16 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/alexeypa@chromium.org/12092117/8003
7 years, 10 months ago (2013-02-01 21:22:30 UTC) #5
commit-bot: I haz the power
7 years, 10 months ago (2013-02-01 21:22:49 UTC) #6
Failed to apply patch for remoting/host/win/remoting_core.manifest:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A         remoting/host/win/remoting_core.manifest
  Copied chrome/app/chrome.dll.manifest ->
remoting/host/win/remoting_core.manifest
  patching file remoting/host/win/remoting_core.manifest
  Hunk #1 FAILED at 1.
  1 out of 1 hunk FAILED -- saving rejects to file
remoting/host/win/remoting_core.manifest.rej

Patch:   NR 
chrome/app/chrome.dll.manifest->remoting/host/win/remoting_core.manifest
Index: remoting/host/win/remoting_core.manifest
diff --git a/chrome/app/chrome.dll.manifest
b/remoting/host/win/remoting_core.manifest
similarity index 52%
copy from chrome/app/chrome.dll.manifest
copy to remoting/host/win/remoting_core.manifest
index
c2de75352d9e2170ea8af2331860747047b867c6..d3517547db9e2a107ebcdeceb0f292a1d1000fbe
100644
--- a/chrome/app/chrome.dll.manifest
+++ b/remoting/host/win/remoting_core.manifest
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls"
version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df"
language="*"></assemblyIdentity>
-    </dependentAssembly>
-  </dependency>
-</assembly>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls"
version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df"
language="*" />
+    </dependentAssembly>
+  </dependency>
+</assembly>

Powered by Google App Engine
This is Rietveld 408576698