Roll chromium_revision 42930fc83a..f9a24d5d6f (564069:564886)
Change log:42930fc83a..f9a24d5d6fFull diff:42930fc83a..f9a24d5d6fRoll chromium third_party 2f3180d1a4..addc496eeb Change log:2f3180d1a4..addc496eebChanged dependencies: * src/base:5d5b155006..769dcfb902* src/build:de1de7df37..2574ebeaaf* src/buildtools:893eb86b02..6f4dae280c* src/ios:78bc41f03c..044af8282c* src/testing:36f6919025..5ab6ab6e1c* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/54e864df3f..01f608bbcf * src/third_party/depot_tools:518bb6847a..e89dcf7dee* src/third_party/libvpx/source/libvpx:2b08f89076..3f7e6cc020* src/tools:bea2920553..8a16887980DEPS diff:42930fc83a..f9a24d5d6f/DEPS No update to Clang. TBR=buildbot@webrtc.org,marpan@webrtc.org, BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal NO_AUTOIMPORT_DEPS_CHECK=true Change-Id: I22104809b6bec8ab773411983357f2d385332395 Reviewed-on: https://webrtc-review.googlesource.com/82060 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23545}
This commit is contained in:
Patrik Höglund
Commit Bot
parent
efc71e565e
commit
9edbc27960
22
DEPS
22
DEPS
@ -10,7 +10,7 @@ vars = {
|
||||
'checkout_configuration': 'default',
|
||||
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
|
||||
'webrtc_git': 'https://webrtc.googlesource.com',
|
||||
'chromium_revision': '42930fc83a837e9ab33055cca46bdf90c0d9f971',
|
||||
'chromium_revision': 'f9a24d5d6f4b6c11a152352cfa6d05d8c99dba12',
|
||||
'boringssl_git': 'https://boringssl.googlesource.com',
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling swarming_client
|
||||
@ -27,7 +27,7 @@ vars = {
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling catapult
|
||||
# and whatever else without interference from each other.
|
||||
'catapult_revision': '54e864df3f870ba7c3b9a47ce392eb1a6db57edc',
|
||||
'catapult_revision': '01f608bbcf59a818904459fc563e2d6ff5f49395',
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling libFuzzer
|
||||
# and whatever else without interference from each other.
|
||||
@ -43,17 +43,17 @@ vars = {
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling Chromium third_party
|
||||
# and whatever else without interference from each other.
|
||||
'chromium_third_party_revision': '2f3180d1a4655b9c036ef31c6341af5cd99c5de8',
|
||||
'chromium_third_party_revision': 'addc496eebc04125394dac66adfea455ce34a023',
|
||||
}
|
||||
deps = {
|
||||
# TODO(kjellander): Move this to be Android-only once the libevent dependency
|
||||
# in base/third_party/libevent is solved.
|
||||
'src/base':
|
||||
Var('chromium_git') + '/chromium/src/base' + '@' + '5d5b155006f6011bcaca0d116fbd2dd3cca872cf',
|
||||
Var('chromium_git') + '/chromium/src/base' + '@' + '769dcfb90227eeb9198f3c78ffeb226ad9226f68',
|
||||
'src/build':
|
||||
Var('chromium_git') + '/chromium/src/build' + '@' + 'de1de7df3723771f22af1bb56cdf8490342ee2ec',
|
||||
Var('chromium_git') + '/chromium/src/build' + '@' + '2574ebeaaf3b24b53e4ae09872dbf2a810c5921b',
|
||||
'src/buildtools':
|
||||
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '893eb86b02b2571894e328f05551112b96df1cce',
|
||||
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '6f4dae280c6a542acacd8db281decc5c0b2a9823',
|
||||
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
|
||||
'src/examples/androidtests/third_party/gradle': {
|
||||
'url': Var('chromium_git') + '/external/github.com/gradle/gradle.git' + '@' +
|
||||
@ -61,11 +61,11 @@ deps = {
|
||||
'condition': 'checkout_android',
|
||||
},
|
||||
'src/ios': {
|
||||
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '78bc41f03c2987096972316a56099f1bc221fc3d',
|
||||
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '044af8282c43e55d5153b2333369458d9068eb52',
|
||||
'condition': 'checkout_ios',
|
||||
},
|
||||
'src/testing':
|
||||
Var('chromium_git') + '/chromium/src/testing' + '@' + '36f69190252beb22b31e37edfa203b4215c6ee7d',
|
||||
Var('chromium_git') + '/chromium/src/testing' + '@' + '5ab6ab6e1c938dfd5c84f3fa4a1425144021ffc1',
|
||||
# This entry is used for chromium third_party rolling into webrtc third_party only.
|
||||
'src/third_party_chromium': {
|
||||
'url': Var('chromium_git') + '/chromium/src/third_party' + '@' + Var('chromium_third_party_revision'),
|
||||
@ -94,7 +94,7 @@ deps = {
|
||||
'src/third_party/colorama/src':
|
||||
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
|
||||
'src/third_party/depot_tools':
|
||||
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '518bb6847a6e29b2bc23a2b7b3a39d9aa5adc166',
|
||||
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'e89dcf7dee37d535a9180823f2c8fe33cde1bfcc',
|
||||
'src/third_party/errorprone/lib': {
|
||||
'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7',
|
||||
'condition': 'checkout_android',
|
||||
@ -135,7 +135,7 @@ deps = {
|
||||
'src/third_party/libsrtp':
|
||||
Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + 'fc2345089a6b3c5aca9ecd2e1941871a78a13e9c',
|
||||
'src/third_party/libvpx/source/libvpx':
|
||||
Var('chromium_git') + '/webm/libvpx.git' + '@' + '2b08f89076d1e93339fbbcc10e3298a0eec66bd6',
|
||||
Var('chromium_git') + '/webm/libvpx.git' + '@' + '3f7e6cc020446ee29439f1cd7d3d5c39adaf64c0',
|
||||
'src/third_party/libyuv':
|
||||
Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '196e2e72a3190f539d5ad5f32c7b154154324951',
|
||||
'src/third_party/lss': {
|
||||
@ -175,7 +175,7 @@ deps = {
|
||||
'src/third_party/yasm/source/patched-yasm':
|
||||
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc',
|
||||
'src/tools':
|
||||
Var('chromium_git') + '/chromium/src/tools' + '@' + 'bea2920553dd451345439f0ace14b6e209e21d42',
|
||||
Var('chromium_git') + '/chromium/src/tools' + '@' + '8a1688798085cdb6eebcd3fa3404b9eba7ef8569',
|
||||
'src/tools/gyp':
|
||||
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
|
||||
'src/tools/swarming_client':
|
||||
|
||||
3
third_party/breakpad/BUILD.gn
vendored
3
third_party/breakpad/BUILD.gn
vendored
@ -180,7 +180,8 @@ if (!is_win) {
|
||||
include_dirs = [ "breakpad/src" ]
|
||||
|
||||
libfuzzer_options = [
|
||||
"close_fd_mask=3",
|
||||
# Suppress stdout from stackwalk_common, as it uses printf() directly.
|
||||
"close_fd_mask=1",
|
||||
"max_len=128000",
|
||||
]
|
||||
|
||||
|
||||
@ -95,7 +95,6 @@ chrome.developerPrivate.ViewType = {
|
||||
EXTENSION_DIALOG: 'EXTENSION_DIALOG',
|
||||
EXTENSION_GUEST: 'EXTENSION_GUEST',
|
||||
EXTENSION_POPUP: 'EXTENSION_POPUP',
|
||||
PANEL: 'PANEL',
|
||||
TAB_CONTENTS: 'TAB_CONTENTS',
|
||||
};
|
||||
|
||||
|
||||
@ -4,6 +4,26 @@
|
||||
|
||||
/** @fileoverview Externs generated from namespace: fileManagerPrivate */
|
||||
|
||||
/**
|
||||
* @const
|
||||
*/
|
||||
chrome.fileManagerPrivate = {};
|
||||
|
||||
/** @enum {string} */
|
||||
chrome.fileManagerPrivate.Verb = {
|
||||
OPEN_WITH: 'open_with',
|
||||
ADD_TO: 'add_to',
|
||||
PACK_WITH: 'pack_with',
|
||||
SHARE_WITH: 'share_with',
|
||||
};
|
||||
|
||||
/** @enum {string} */
|
||||
chrome.fileManagerPrivate.SourceRestriction = {
|
||||
ANY_SOURCE: 'any_source',
|
||||
NATIVE_SOURCE: 'native_source',
|
||||
NATIVE_OR_DRIVE_SOURCE: 'native_or_drive_source',
|
||||
};
|
||||
|
||||
/**
|
||||
* @typedef {{
|
||||
* taskId: string,
|
||||
@ -14,14 +34,6 @@
|
||||
*/
|
||||
var FileTask;
|
||||
|
||||
/**
|
||||
* @typedef {{
|
||||
* icon16x16Url: (string|undefined),
|
||||
* icon32x32Url: (string|undefined)
|
||||
* }}
|
||||
*/
|
||||
var IconSet;
|
||||
|
||||
/**
|
||||
* @typedef {{
|
||||
* size: (number|undefined),
|
||||
@ -29,22 +41,22 @@ var IconSet;
|
||||
* modificationByMeTime: (number|undefined),
|
||||
* thumbnailUrl: (string|undefined),
|
||||
* croppedThumbnailUrl: (string|undefined),
|
||||
* externalFileUrl: (string|undefined),
|
||||
* alternateUrl: (string|undefined),
|
||||
* shareUrl: (string|undefined),
|
||||
* imageWidth: (number|undefined),
|
||||
* imageHeight: (number|undefined),
|
||||
* imageRotation: (number|undefined),
|
||||
* pinned: (boolean|undefined),
|
||||
* present: (boolean|undefined),
|
||||
* hosted: (boolean|undefined),
|
||||
* dirty: (boolean|undefined),
|
||||
* availableOffline: (boolean|undefined),
|
||||
* availableWhenMetered: (boolean|undefined),
|
||||
* dirty: (boolean|undefined),
|
||||
* customIconUrl: (string|undefined),
|
||||
* contentMimeType: (string|undefined),
|
||||
* sharedWithMe: (boolean|undefined),
|
||||
* shared: (boolean|undefined)
|
||||
* shared: (boolean|undefined),
|
||||
* externalFileUrl: (string|undefined),
|
||||
* alternateUrl: (string|undefined),
|
||||
* shareUrl: (string|undefined)
|
||||
* }}
|
||||
*/
|
||||
var EntryProperties;
|
||||
@ -66,11 +78,18 @@ var MountPointSizeStats;
|
||||
*/
|
||||
var ProfileInfo;
|
||||
|
||||
/**
|
||||
* @typedef {{
|
||||
* icon16x16Url: (string|undefined),
|
||||
* icon32x32Url: (string|undefined)
|
||||
* }}
|
||||
*/
|
||||
var IconSet;
|
||||
|
||||
/**
|
||||
* @typedef {{
|
||||
* volumeId: string,
|
||||
* fileSystemId: (string|undefined),
|
||||
* iconSet: IconSet,
|
||||
* source: string,
|
||||
* volumeLabel: (string|undefined),
|
||||
* profile: ProfileInfo,
|
||||
@ -86,7 +105,8 @@ var ProfileInfo;
|
||||
* watchable: boolean,
|
||||
* mountCondition: (string|undefined),
|
||||
* mountContext: (string|undefined),
|
||||
* diskFileSystemType: (string|undefined)
|
||||
* diskFileSystemType: (string|undefined),
|
||||
* iconSet: IconSet
|
||||
* }}
|
||||
*/
|
||||
var VolumeMetadata;
|
||||
@ -105,10 +125,10 @@ var MountCompletedEvent;
|
||||
* @typedef {{
|
||||
* fileUrl: string,
|
||||
* transferState: string,
|
||||
* transferType: string,
|
||||
* processed: number,
|
||||
* total: number,
|
||||
* num_total_jobs: number
|
||||
* num_total_jobs: number,
|
||||
* hideWhenZeroJobs: boolean
|
||||
* }}
|
||||
*/
|
||||
var FileTransferStatus;
|
||||
@ -224,19 +244,6 @@ var DeviceEvent;
|
||||
*/
|
||||
var Provider;
|
||||
|
||||
/**
|
||||
* @typedef {{
|
||||
* id: string,
|
||||
* title: (string|undefined)
|
||||
* }}
|
||||
*/
|
||||
var EntryAction;
|
||||
|
||||
/**
|
||||
* @const
|
||||
*/
|
||||
chrome.fileManagerPrivate = {};
|
||||
|
||||
/**
|
||||
* Logout the current user for navigating to the re-authentication screen for
|
||||
* the Google account.
|
||||
@ -281,6 +288,14 @@ chrome.fileManagerPrivate.setDefaultTask = function(taskId, entries, mimeTypes,
|
||||
*/
|
||||
chrome.fileManagerPrivate.getFileTasks = function(entries, callback) {};
|
||||
|
||||
/**
|
||||
* Gets the MIME type of a file.
|
||||
* @param {!Entry} entry
|
||||
* @param {function((string|undefined))} callback Callback that MIME type of the
|
||||
* file is passed.
|
||||
*/
|
||||
chrome.fileManagerPrivate.getMimeType = function(entry, callback) {};
|
||||
|
||||
/**
|
||||
* Gets localized strings and initialization data. |callback|
|
||||
* @param {function((!Object|undefined))} callback |result| Hash containing the
|
||||
@ -602,17 +617,6 @@ chrome.fileManagerPrivate.getDownloadUrl = function(entry, callback) {};
|
||||
chrome.fileManagerPrivate.requestDriveShare = function(entry, shareType,
|
||||
callback) {};
|
||||
|
||||
/**
|
||||
* Requests to install a webstore item. |item_id| The id of the item to
|
||||
* install. |silentInstallation| False to show installation prompt. True not to
|
||||
* show. |callback|
|
||||
* @param {string} itemId
|
||||
* @param {boolean} silentInstallation
|
||||
* @param {function()} callback Callback that does not take arguments.
|
||||
*/
|
||||
chrome.fileManagerPrivate.installWebstoreItem = function(itemId,
|
||||
silentInstallation, callback) {};
|
||||
|
||||
/**
|
||||
* Obtains a list of profiles that are logged-in.
|
||||
* @param {function((!Array<!ProfileInfo>|undefined), (string|undefined),
|
||||
@ -642,14 +646,6 @@ chrome.fileManagerPrivate.openSettingsSubpage = function(sub_page) {};
|
||||
*/
|
||||
chrome.fileManagerPrivate.computeChecksum = function(entry, callback) {};
|
||||
|
||||
/**
|
||||
* Gets the MIME type of a file.
|
||||
* @param {!Entry} entry
|
||||
* @param {function((string|undefined))} callback Callback that MIME type of the
|
||||
* file is passed.
|
||||
*/
|
||||
chrome.fileManagerPrivate.getMimeType = function(entry, callback) {};
|
||||
|
||||
/**
|
||||
* Gets a flag indicating whether user metrics reporting is enabled.
|
||||
* @param {function((boolean|undefined))} callback
|
||||
@ -704,6 +700,16 @@ chrome.fileManagerPrivate.configureVolume = function(volumeId, callback) {};
|
||||
*/
|
||||
chrome.fileManagerPrivate.getCustomActions = function(entries, callback) {};
|
||||
|
||||
/**
|
||||
* Executes the action on the specified set of entries. If not possible, then
|
||||
* returns an error via chrome.runtime.lastError.
|
||||
* @param {!Array<!Entry>} entries
|
||||
* @param {string} actionId
|
||||
* @param {function()} callback
|
||||
*/
|
||||
chrome.fileManagerPrivate.executeCustomAction = function(
|
||||
entries, actionId, callback) {};
|
||||
|
||||
/**
|
||||
* Get the total size of a directory. |entry| Entry of the target directory.
|
||||
* |callback|
|
||||
@ -719,16 +725,6 @@ chrome.fileManagerPrivate.getDirectorySize = function(entry, callback) {};
|
||||
*/
|
||||
chrome.fileManagerPrivate.getRecentFiles = function(restriction, callback) {};
|
||||
|
||||
/**
|
||||
* Executes the action on the specified set of entries. If not possible, then
|
||||
* returns an error via chrome.runtime.lastError.
|
||||
* @param {!Array<!Entry>} entries
|
||||
* @param {string} actionId
|
||||
* @param {function()} callback
|
||||
*/
|
||||
chrome.fileManagerPrivate.executeCustomAction = function(
|
||||
entries, actionId, callback) {};
|
||||
|
||||
/**
|
||||
* Returns true if crostini is enabled.
|
||||
* @param {function(boolean)} callback
|
||||
@ -770,17 +766,27 @@ chrome.fileManagerPrivate.onDriveSyncError;
|
||||
/** @type {!ChromeEvent} */
|
||||
chrome.fileManagerPrivate.onAppsUpdated;
|
||||
|
||||
/** @enum {string} */
|
||||
chrome.fileManagerPrivate.Verb = {
|
||||
OPEN_WITH: 'open_with',
|
||||
ADD_TO: 'add_to',
|
||||
PACK_WITH: 'pack_with',
|
||||
SHARE_WITH: 'share_with',
|
||||
};
|
||||
/* The two declarations below (EntryAction, installWebstoreItem) don't have any
|
||||
* corresponding entry in the file_manager_private.idl file.
|
||||
*
|
||||
* TODO(nigeltao): delete them.
|
||||
*/
|
||||
|
||||
/** @enum {string} */
|
||||
chrome.fileManagerPrivate.SourceRestriction = {
|
||||
ANY_SOURCE: 'any_source',
|
||||
NATIVE_SOURCE: 'native_source',
|
||||
NATIVE_OR_DRIVE_SOURCE: 'native_or_drive_source',
|
||||
};
|
||||
/**
|
||||
* @typedef {{
|
||||
* id: string,
|
||||
* title: (string|undefined)
|
||||
* }}
|
||||
*/
|
||||
var EntryAction;
|
||||
|
||||
/**
|
||||
* Requests to install a webstore item. |item_id| The id of the item to
|
||||
* install. |silentInstallation| False to show installation prompt. True not to
|
||||
* show. |callback|
|
||||
* @param {string} itemId
|
||||
* @param {boolean} silentInstallation
|
||||
* @param {function()} callback Callback that does not take arguments.
|
||||
*/
|
||||
chrome.fileManagerPrivate.installWebstoreItem = function(
|
||||
itemId, silentInstallation, callback) {};
|
||||
|
||||
2
third_party/ijar/README.chromium
vendored
2
third_party/ijar/README.chromium
vendored
@ -11,6 +11,6 @@ A tool for generating interface .jars from normal .jars.
|
||||
|
||||
Local Modifications:
|
||||
- Removed test directory
|
||||
- Added BUILD.gn and ijar.gni
|
||||
- Added BUILD.gn
|
||||
- Enabled CRC32 zip entries by passing true to 3rd parameter of FinishFile()
|
||||
within ijar.cc
|
||||
|
||||
4
third_party/libvpx/README.chromium
vendored
4
third_party/libvpx/README.chromium
vendored
@ -5,9 +5,9 @@ License: BSD
|
||||
License File: source/libvpx/LICENSE
|
||||
Security Critical: yes
|
||||
|
||||
Date: Monday May 28 2018
|
||||
Date: Friday June 01 2018
|
||||
Branch: master
|
||||
Commit: 2b08f89076d1e93339fbbcc10e3298a0eec66bd6
|
||||
Commit: 3f7e6cc020446ee29439f1cd7d3d5c39adaf64c0
|
||||
|
||||
Description:
|
||||
Contains the sources used to compile libvpx binaries used by Google Chrome and
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#define VERSION_MAJOR 1
|
||||
#define VERSION_MINOR 7
|
||||
#define VERSION_PATCH 0
|
||||
#define VERSION_EXTRA "404-g2b08f8907"
|
||||
#define VERSION_EXTRA "428-g3f7e6cc02"
|
||||
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
|
||||
#define VERSION_STRING_NOSP "v1.7.0-404-g2b08f8907"
|
||||
#define VERSION_STRING " v1.7.0-404-g2b08f8907"
|
||||
#define VERSION_STRING_NOSP "v1.7.0-428-g3f7e6cc02"
|
||||
#define VERSION_STRING " v1.7.0-428-g3f7e6cc02"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user