summaryrefslogtreecommitdiffstats
path: root/chrome_elf
diff options
context:
space:
mode:
authorcaitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 20:35:23 +0000
committercaitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 20:35:23 +0000
commitc73ec8abdd625a0ef63aba909884c632896ce4d9 (patch)
tree4a5aba5f877da87a8246c101deb8b51d51218401 /chrome_elf
parent3f56440dfc575f11e02e9966806d4f4ffeff6c0f (diff)
downloadchromium_src-c73ec8abdd625a0ef63aba909884c632896ce4d9.zip
chromium_src-c73ec8abdd625a0ef63aba909884c632896ce4d9.tar.gz
chromium_src-c73ec8abdd625a0ef63aba909884c632896ce4d9.tar.bz2
Move Version Assembly code out of chrome_elf.
This code is not chrome_elf-specific, rather, chrome_elf is the only current user of it. Move the manifest building logic to a more generic location. BUG=324863 Review URL: https://codereview.chromium.org/137373002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245307 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf')
-rw-r--r--chrome_elf/OWNERS3
-rw-r--r--chrome_elf/README15
-rw-r--r--chrome_elf/chrome_exe_manifest.template10
-rw-r--r--chrome_elf/chrome_exe_manifest_action.gypi34
-rw-r--r--chrome_elf/version_assembly_manifest.template8
-rw-r--r--chrome_elf/version_assembly_manifest_action.gypi37
6 files changed, 1 insertions, 106 deletions
diff --git a/chrome_elf/OWNERS b/chrome_elf/OWNERS
index d2e52d6..3d69bab 100644
--- a/chrome_elf/OWNERS
+++ b/chrome_elf/OWNERS
@@ -1,3 +1,2 @@
caitkp@chromium.org
- gab@chromium.org
- robertshield@chromium.org \ No newline at end of file
+ robertshield@chromium.org
diff --git a/chrome_elf/README b/chrome_elf/README
deleted file mode 100644
index b657437..0000000
--- a/chrome_elf/README
+++ /dev/null
@@ -1,15 +0,0 @@
-Chrome Early Loading Framework (aka ChromeELF)
-
-chrome_elf.dll is shipped in Chrome's version directory to ease updates,
-and is loaded early in chrome.exe's lifetime. This is done by turning the
-version directory into a private assembly which refers to chrome_elf.dll
-(http://msdn.microsoft.com/library/aa374224.aspx).
-
-In an ideal world, this would be done by embedding an application config in
-chrome.exe that would refer to the proper version directory via a
-probing\privatePath attribute (http://msdn.microsoft.com/library/aa374182.aspx).
-This would allow us to refer to dlls in the version directory without having to
-make the version directory itself into an assembly. It would also avoid naming
-conflicts (as the WinSxS dir and GAC both take precedence over private
-assemblies when searching for dlls). Unfortunately, the probing\privatePath
-attribute is only supported for Windows 7 and later.
diff --git a/chrome_elf/chrome_exe_manifest.template b/chrome_elf/chrome_exe_manifest.template
deleted file mode 100644
index 7c66328..0000000
--- a/chrome_elf/chrome_exe_manifest.template
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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='@MAJOR@.@MINOR@.@BUILD@.@PATCH@'
- version='@MAJOR@.@MINOR@.@BUILD@.@PATCH@' language='*'/>
- </dependentAssembly>
- </dependency>
-</assembly> \ No newline at end of file
diff --git a/chrome_elf/chrome_exe_manifest_action.gypi b/chrome_elf/chrome_exe_manifest_action.gypi
deleted file mode 100644
index 89453db..0000000
--- a/chrome_elf/chrome_exe_manifest_action.gypi
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2013 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.
-
-# This file contains an action which can be used to construct a manifest file
-# declaring a dependency on chrome_elf.dll. This manifest can then be merged
-# into the manifest of the executable and embedded into it when it is built.
-
-# To use this the following variables need to be defined:
-# version_path: string: path to file containing version data (e.g.
-# chrome/VERSION).
-# version_py_path: string: path to file containing version script (e.g.
-# chrome/tools/build/version.py).
-
-{
- 'variables': {
- 'template_input_path':
- '<(DEPTH)/chrome_elf/chrome_exe_manifest.template',
- },
- 'inputs': [
- '<(template_input_path)',
- '<(version_path)',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/chrome_elf/version_assembly.manifest',
- ],
- 'action': [
- 'python', '<(version_py_path)',
- '-f', '<(version_path)',
- '<(template_input_path)',
- '<@(_outputs)',
- ],
- 'message': 'Generating <@(_outputs)',
-} \ No newline at end of file
diff --git a/chrome_elf/version_assembly_manifest.template b/chrome_elf/version_assembly_manifest.template
deleted file mode 100644
index 153194c..0000000
--- a/chrome_elf/version_assembly_manifest.template
+++ /dev/null
@@ -1,8 +0,0 @@
-<assembly
- xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
- <assemblyIdentity
- name='@MAJOR@.@MINOR@.@BUILD@.@PATCH@'
- version='@MAJOR@.@MINOR@.@BUILD@.@PATCH@'
- type='win32'/>
- <file name='chrome_elf.dll'/>
-</assembly> \ No newline at end of file
diff --git a/chrome_elf/version_assembly_manifest_action.gypi b/chrome_elf/version_assembly_manifest_action.gypi
deleted file mode 100644
index 37c2015..0000000
--- a/chrome_elf/version_assembly_manifest_action.gypi
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2013 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.
-
-# This file contains an action which can be used to construct a manifest file
-# with the same name as the version directory so that chrome.exe identifies the
-# version directory as an assembly. This will be copied over to the version
-# directory by the installer script.
-
-# To use this the following variables need to be defined:
-# version_path: string: path to file containing version data (e.g.
-# chrome/VERSION).
-# version_py_path: string: path to file containing version script (e.g.
-# chrome/tools/build/version.py).
-# version_full: string: version string in W.X.Y.Z form.
-
-
-{
- 'variables': {
- 'template_input_path':
- '<(DEPTH)/chrome_elf/version_assembly_manifest.template',
- },
- 'inputs': [
- '<(template_input_path)',
- '<(version_path)',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/<(version_full).manifest',
- ],
- 'action': [
- 'python', '<(version_py_path)',
- '-f', '<(version_path)',
- '<(template_input_path)',
- '<@(_outputs)',
- ],
- 'message': 'Generating <@(_outputs)',
-}