mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 68.0.3425.0 (#557062)
Known issues: - Surface synchronization is now enabled for OSR, see issue #2447. - Jumbo build is broken, fixed in https://crrev.com/868717ce.
This commit is contained in:
@ -108,6 +108,14 @@ parser.add_option(
|
||||
type='string',
|
||||
default=[],
|
||||
help='optional patch name to process (multiples allowed)')
|
||||
parser.add_option(
|
||||
'--add',
|
||||
action='extend',
|
||||
dest='add',
|
||||
type='string',
|
||||
default=[],
|
||||
help='optional relative file paths to add (multiples allowed). Used in ' +\
|
||||
'combination with --resave and a single --patch value.')
|
||||
(options, args) = parser.parse_args()
|
||||
|
||||
if options.resave and options.revert:
|
||||
@ -115,6 +123,11 @@ if options.resave and options.revert:
|
||||
parser.print_help(sys.stderr)
|
||||
sys.exit()
|
||||
|
||||
if len(options.add) > 0 and (len(options.patch) != 1 or not options.resave):
|
||||
print '--add can only be used with --resave and a single --patch value.'
|
||||
parser.print_help(sys.stderr)
|
||||
sys.exit()
|
||||
|
||||
# The CEF root directory is the parent directory of _this_ script.
|
||||
cef_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
|
||||
src_dir = os.path.abspath(os.path.join(cef_dir, os.pardir))
|
||||
@ -258,6 +271,17 @@ for patch in patches:
|
||||
msg('No backup of %s' % patch_path_abs)
|
||||
|
||||
if (not options.revert and not options.reapply) or has_backup_changes:
|
||||
if len(options.add) > 0:
|
||||
# Add additional requested files to the patch.
|
||||
for patch_path in options.add:
|
||||
patch_path_abs = os.path.abspath(os.path.join(patch_root_abs, \
|
||||
patch_path))
|
||||
if os.path.exists(patch_path_abs):
|
||||
msg('Adding file %s' % patch_path_abs)
|
||||
patch_paths.append(patch_path)
|
||||
else:
|
||||
msg('Skipping non-existing file %s' % patch_path_abs)
|
||||
|
||||
msg('Saving changes to %s' % patch_file)
|
||||
if added_paths:
|
||||
# Inform git of the added paths so they appear in the patch file.
|
||||
|
Reference in New Issue
Block a user