Commit 9a3a66ac authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Remove binary files from sources (Win)

No changes to generated ninja files, except that chrome_exe_version_manifest now
does not generate an empty source_set.

chrome/app/version_assembly/BUILD.gn:
  The process_version gn template generates data files from template files
  (eg. myfile.h.in -> myfile.h).  The gn template automatically adds a
  source_set with the generated files in it, but it may be useless if only
  binary files were generated, and in fact gn will now error-out if any binary
  files are added.  Adding "process_only=true" disables creation of the
  source_set, so we add this in cases where the output files are all binary
  files.

chrome/credential_provider/gaiacp/BUILD.gn:
gcapi_dll_version.rc.version already listed in inputs in [1].

chrome/installer/mini_installer/BUILD.gn:
chrome.release already listed in inputs in [2].

chrome/installer/setup/BUILD.gn:
setup_exe_version.rc.version is already listed as the template_file of a
process_version_rc_template in [3].

chrome/test/BUILD.gn:
  chrome_version.rc.version is already listed as the _template_file in
  process_version_rc_template as appropriate in [4].  Likely odd code left over
  from gyp->gn conversion.

  *.cur: Implicitly added by grit rule for ui_unscaled_resources.grd in [5].

NOPRESUBMIT necessary to avoid header checks for com_imported_mstscax.h

[1] https://cs.chromium.org/chromium/src/chrome/credential_provider/gaiacp/BUILD.gn?q=gaia_credential_provider.rgs&sq=package:chromium&g=0&l=189
[2] https://cs.chromium.org/chromium/src/chrome/installer/mini_installer/BUILD.gn?rcl=56a647b2510baf3b314fab1130dbe08c191c9072&l=140
[3] https://cs.chromium.org/chromium/src/chrome/installer/setup/BUILD.gn?type=cs&q=setup_exe_version.rc.version+file:%5C.gn&sq=package:chromium&g=0&l=120
[4] https://cs.chromium.org/chromium/src/chrome/process_version_rc_template.gni?type=cs&q=chrome_version.rc.version+file:%5C.gn&sq=package:chromium&g=0&l=45
[5] https://cs.chromium.org/chromium/src/ui/resources/ui_unscaled_resources.grd?type=cs&q=aliasb.cur&sq=package:chromium&g=0&l=12

BUG=964411
NOPRESUBMIT=true

Change-Id: I74549063376162091d7422c3769c1c3cb2ae4e67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1652512Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#668473}
parent a5df2215
......@@ -10,6 +10,7 @@ version_assembly_output_file = "$target_gen_dir/version_assembly.manifest"
# Generates a manifest file with the current build's version information.
process_version("chrome_exe_version_manifest") {
process_only = true
visibility = [ ":*" ]
template_file = "chrome_exe_manifest.template"
sources = [
......
......@@ -205,7 +205,6 @@ shared_library("gaia1_0") {
"dllmain.cc",
"dllmain.h",
"gaia_credential_provider.def",
"gaia_credential_provider.rgs",
]
deps = [
":common",
......
......@@ -13,7 +13,6 @@ shared_library("gcapi") {
sources = [
"gcapi.def",
"gcapi_dll.cc",
"gcapi_dll_version.rc.version",
]
deps = [
......
......@@ -28,7 +28,6 @@ config("mini_installer_compiler_flags") {
source_set("lib") {
sources = [
"appid.h",
"chrome.release",
"chrome_appid.cc",
"configuration.cc",
"configuration.h",
......
......@@ -19,7 +19,6 @@ if (is_win) {
executable("setup") {
sources = [
"setup.rc",
"setup_exe_version.rc.version",
"setup_main.cc",
"setup_main.h",
"setup_resource.h",
......
......@@ -730,7 +730,6 @@ if (!is_android) {
sources = [
"../../apps/app_restore_service_browsertest.cc",
"../../apps/load_and_launch_browsertest.cc",
"../app/chrome_version.rc.version",
"../browser/accessibility/accessibility_labels_service_browsertest.cc",
"../browser/accessibility/browser_accessibility_state_browsertest.cc",
"../browser/accessibility/image_annotation_browsertest.cc",
......@@ -2349,8 +2348,6 @@ if (!is_android) {
if (is_chrome_branded) {
deps += [ "//chrome/browser/win/conflicts:browser_tests" ]
}
} else { # Not Windows.
sources -= [ "../app/chrome_version.rc.version" ]
}
if (is_mac || is_win) {
sources += [
......@@ -5450,15 +5447,6 @@ if (!is_android) {
"../browser/notifications/win/fake_itoastnotifier.cc",
"../browser/notifications/win/fake_itoastnotifier.h",
"../browser/ui/views/touch_events_interactive_uitest_win.cc",
"//ui/resources/cursors/aliasb.cur",
"//ui/resources/cursors/cell.cur",
"//ui/resources/cursors/col_resize.cur",
"//ui/resources/cursors/copy.cur",
"//ui/resources/cursors/none.cur",
"//ui/resources/cursors/row_resize.cur",
"//ui/resources/cursors/vertical_text.cur",
"//ui/resources/cursors/zoom_in.cur",
"//ui/resources/cursors/zoom_out.cur",
]
deps += [
"//chrome:other_version",
......@@ -5745,7 +5733,6 @@ if (!is_android && !is_fuchsia) {
test("sync_integration_tests") {
sources = [
"../app/chrome_version.rc.version",
"../browser/sync/test/integration/enable_disable_test.cc",
"../browser/sync/test/integration/local_sync_test.cc",
"../browser/sync/test/integration/migration_test.cc",
......@@ -5863,8 +5850,6 @@ if (!is_android && !is_fuchsia) {
configs -= [ "//build/config/win:default_incremental_linking" ]
configs +=
[ "//build/config/win:default_large_module_incremental_linking" ]
} else {
sources -= [ "../app/chrome_version.rc.version" ]
}
if (is_chromeos) {
sources += [
......@@ -5891,7 +5876,6 @@ if (!is_android && !is_fuchsia) {
test("sync_performance_tests") {
sources = [
"../app/chrome_version.rc.version",
"../browser/sync/test/integration/performance/autofill_sync_perf_test.cc",
"../browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc",
"../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc",
......@@ -5935,8 +5919,6 @@ if (!is_android && !is_fuchsia) {
configs -= [ "//build/config/win:default_incremental_linking" ]
configs +=
[ "//build/config/win:default_large_module_incremental_linking" ]
} else {
sources -= [ "../app/chrome_version.rc.version" ]
}
if (toolkit_views) {
......
......@@ -118,7 +118,7 @@ source_set("win") {
if (is_clang) {
# TODO(thakis): Remove this once midl.exe no longer produces nonstandard
# C++ (see the enums in com_imported_mstscax.tlh).
# C++ (see the enums in com_imported_mstscax.h).
cflags = [ "-Wno-microsoft-enum-forward-reference" ]
}
......
......@@ -19,7 +19,7 @@
#include "remoting/host/screen_resolution.h"
// The following header was generated by Visual Studio. We had to check it in
// due to a bug in VS2013. See crbug.com/318952 for details.
#include "remoting/host/win/com_imported_mstscax.tlh"
#include "remoting/host/win/com_imported_mstscax.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
namespace remoting {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment