chrome/installer/mini_installer/chrome.release - Issue 2715563002: Moving SwiftShader from component to bundled library

Side by Side Diff: chrome/installer/mini_installer/chrome.release

Issue 2715563002: Moving SwiftShader from component to bundled library (Closed)

Patch Set: Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

OLD	NEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 [GENERAL]	5 [GENERAL]

6 #	6 #

7 # Chrome Application dir entries, sorted alphabetically.	7 # Chrome Application dir entries, sorted alphabetically.

8 #	8 #

9 chrome.exe: %(ChromeDir)s\	9 chrome.exe: %(ChromeDir)s\

10 #	10 #

(...skipping 54 matching lines...) Loading...
65 #	65 #

66 # Widevine CDM sub-dir	66 # Widevine CDM sub-dir

67 #	67 #

68 WidevineCdm\manifest.json: %(VersionDir)s\WidevineCdm\	68 WidevineCdm\manifest.json: %(VersionDir)s\WidevineCdm\

69 WidevineCdm\_platform_specific\win_x86\widevinecdm.dll: %(VersionDir)s\WidevineC dm\_platform_specific\win_x86\	69 WidevineCdm\_platform_specific\win_x86\widevinecdm.dll: %(VersionDir)s\WidevineC dm\_platform_specific\win_x86\

70 WidevineCdm\_platform_specific\win_x86\widevinecdm.dll.sig: %(VersionDir)s\Widev ineCdm\_platform_specific\win_x86\	70 WidevineCdm\_platform_specific\win_x86\widevinecdm.dll.sig: %(VersionDir)s\Widev ineCdm\_platform_specific\win_x86\

71 WidevineCdm\_platform_specific\win_x86\widevinecdmadapter.dll: %(VersionDir)s\Wi devineCdm\_platform_specific\win_x86\	71 WidevineCdm\_platform_specific\win_x86\widevinecdmadapter.dll: %(VersionDir)s\Wi devineCdm\_platform_specific\win_x86\

72 WidevineCdm\_platform_specific\win_x64\widevinecdm.dll: %(VersionDir)s\WidevineC dm\_platform_specific\win_x64\	72 WidevineCdm\_platform_specific\win_x64\widevinecdm.dll: %(VersionDir)s\WidevineC dm\_platform_specific\win_x64\

73 WidevineCdm\_platform_specific\win_x64\widevinecdm.dll.sig: %(VersionDir)s\Widev ineCdm\_platform_specific\win_x64\	73 WidevineCdm\_platform_specific\win_x64\widevinecdm.dll.sig: %(VersionDir)s\Widev ineCdm\_platform_specific\win_x64\

74 WidevineCdm\_platform_specific\win_x64\widevinecdmadapter.dll: %(VersionDir)s\Wi devineCdm\_platform_specific\win_x64\	74 WidevineCdm\_platform_specific\win_x64\widevinecdmadapter.dll: %(VersionDir)s\Wi devineCdm\_platform_specific\win_x64\

	75

	76 #

	77 # SwiftShader sub-dir

	78 #

	79 swiftshader\libEGL.dll: %(VersionDir)s\swiftshader\
	grt (UTC plus 2) 2017/02/23 15:00:50 are these only for is_chrome_branded=true builds? are these only for is_chrome_branded=true builds? do you need the inclusion of these files to be conditional on the BUILDFLAG? sugoi 2017/02/23 15:22:55 They could be used with any version, but is_chrome Show quoted text On 2017/02/23 15:00:50, grt (UTC plus 1) wrote: > are these only for is_chrome_branded=true builds? They could be used with any version, but is_chrome_branded would be good enough for now. Just out of curiosity, does this file also create an installer for non chrome branded versions? Show quoted text > do you need the inclusion of these files to be conditional on the BUILDFLAG? I think these should always be bundled on Windows. Note that these libraries are only built for x86 or x64, but I think that covers what chrome supports on Windows, right? (We have that restriction because of MIPS on Linux and I guess ARM would also not work for SwiftShader at the moment). grt (UTC plus 2) 2017/02/23 15:33:38 Yes. Since the BUILDFLAG is no longer conditional Show quoted text On 2017/02/23 15:22:55, sugoi wrote: > On 2017/02/23 15:00:50, grt (UTC plus 1) wrote: > > are these only for is_chrome_branded=true builds? > They could be used with any version, but is_chrome_branded would be good enough > for now. Just out of curiosity, does this file also create an installer for non > chrome branded versions? Yes. Since the BUILDFLAG is no longer conditional on is_chrome_branded=true, it's set for all Windows builds, correct? If so, please move this new block so that it immediately precedes [HIDPI]. Show quoted text > > do you need the inclusion of these files to be conditional on the BUILDFLAG? > I think these should always be bundled on Windows. Note that these libraries are > only built for x86 or x64, but I think that covers what chrome supports on > Windows, right? (We have that restriction because of MIPS on Linux and I guess > ARM would also not work for SwiftShader at the moment). Yup, Windows is x86 and x64 only. sugoi 2017/02/28 16:45:09 Done. Show quoted text On 2017/02/23 15:33:38, grt (UTC plus 1) wrote: > On 2017/02/23 15:22:55, sugoi wrote: > > On 2017/02/23 15:00:50, grt (UTC plus 1) wrote: > > > are these only for is_chrome_branded=true builds? > > They could be used with any version, but is_chrome_branded would be good > enough > > for now. Just out of curiosity, does this file also create an installer for > non > > chrome branded versions? > > Yes. Since the BUILDFLAG is no longer conditional on is_chrome_branded=true, > it's set for all Windows builds, correct? If so, please move this new block so > that it immediately precedes [HIDPI]. > > > > do you need the inclusion of these files to be conditional on the BUILDFLAG? > > I think these should always be bundled on Windows. Note that these libraries > are > > only built for x86 or x64, but I think that covers what chrome supports on > > Windows, right? (We have that restriction because of MIPS on Linux and I guess > > ARM would also not work for SwiftShader at the moment). > > Yup, Windows is x86 and x64 only. Done.
	80 swiftshader\libGLESv2.dll: %(VersionDir)s\swiftshader\

	81

OLD	NEW