mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update brightray and libchromiumcontent to Chrome 54

Browse source
This commit is contained in:
Cheng Zhao 2016-11-29 17:01:34 +09:00 committed by Birunthan Mohanathas
parent 6520396466
commit bdc334d797
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/common/chrome_version.h
View file

@ -8,7 +8,7 @@
#ifndef ATOM_COMMON_CHROME_VERSION_H_ #ifndef ATOM_COMMON_CHROME_VERSION_H_
#define ATOM_COMMON_CHROME_VERSION_H_ #define ATOM_COMMON_CHROME_VERSION_H_
#define CHROME_VERSION_STRING "53.0.2785.143" #define CHROME_VERSION_STRING "54.0.2840.51"
#define CHROME_VERSION "v" CHROME_VERSION_STRING #define CHROME_VERSION "v" CHROME_VERSION_STRING
#endif // ATOM_COMMON_CHROME_VERSION_H_ #endif // ATOM_COMMON_CHROME_VERSION_H_

10
electron.gyp
View file

@ -147,15 +147,15 @@
'destination': '<(PRODUCT_DIR)', 'destination': '<(PRODUCT_DIR)',
'files': [ 'files': [
'<@(copied_libraries)', '<@(copied_libraries)',
# '<(libchromiumcontent_dir)/locales', '<(libchromiumcontent_dir)/locales',
'<(libchromiumcontent_dir)/libEGL.dll', '<(libchromiumcontent_dir)/libEGL.dll',
'<(libchromiumcontent_dir)/libGLESv2.dll', '<(libchromiumcontent_dir)/libGLESv2.dll',
'<(libchromiumcontent_dir)/icudtl.dat', '<(libchromiumcontent_dir)/icudtl.dat',
# '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak', '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
# '<(libchromiumcontent_dir)/content_resources_200_percent.pak', '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
'<(libchromiumcontent_dir)/content_shell.pak', '<(libchromiumcontent_dir)/content_shell.pak',
# '<(libchromiumcontent_dir)/ui_resources_200_percent.pak', '<(libchromiumcontent_dir)/ui_resources_200_percent.pak',
# '<(libchromiumcontent_dir)/views_resources_200_percent.pak', '<(libchromiumcontent_dir)/views_resources_200_percent.pak',
'<(libchromiumcontent_dir)/natives_blob.bin', '<(libchromiumcontent_dir)/natives_blob.bin',
'<(libchromiumcontent_dir)/snapshot_blob.bin', '<(libchromiumcontent_dir)/snapshot_blob.bin',
'external_binaries/d3dcompiler_47.dll', 'external_binaries/d3dcompiler_47.dll',

2
script/lib/config.py
View file

@ -9,7 +9,7 @@ import sys
BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent' 'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \ LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \
'97e32dafa4a1112f14eef61a663cf39a03ed4c97' '9578c02202a6050e3fd48dddd5433fbb48089337'
PLATFORM = { PLATFORM = {
'cygwin': 'win32', 'cygwin': 'win32',

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 5333d0e64b897c8584cee85bfcf7c045a7ca1e66 Subproject commit fe2bf5dcaabbcc9f9ae878f5fce48081292057b1

2
vendor/crashpad vendored

@ -1 +1 @@
Subproject commit 51f78aefa872211022ae2d44260cbfd07a6aeb6a Subproject commit c58712f998445983dfea73da6478194b6c52c3cb