Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade from Chromium 78.0.3904.108 to Chromium 79.0.3945.45 #7043

Closed
wants to merge 4 commits into from
Closed

Upgrade from Chromium 78.0.3904.108 to Chromium 79.0.3945.45 #7043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aff58fe
Upgrade from Chromium 78.0.3904.108 to Chromium 79.0.3945.45
mkarolin Oct 23, 2019
85d7596
Fixed a typo in l10Util.js
mkarolin Nov 21, 2019
e98e566
Updated util.js to copy android XTB files.
mkarolin Nov 22, 2019
770b618
Pin b-c branch.
mkarolin Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/l10nUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const braveSpecificGeneratedResourcesPath = path.resolve(path.join(srcDir, 'brav
const braveResourcesComponentsStringsPath = path.resolve(path.join(srcDir, 'brave', 'components', 'resources', 'brave_components_strings.grd'))
const braveExtensionMessagesPath = path.resolve(path.join(srcDir, 'brave', 'components', 'brave_extension', 'extension', 'brave_extension', '_locales', 'en_US', 'messages.json'))
const braveRewardsExtensionMessagesPath = path.resolve(path.join(srcDir, 'brave', 'components', 'brave_rewards', 'resources', 'extension', 'brave_rewards', '_locales', 'en_US', 'messages.json'))
const braveAndroidBraveStringsPath = path.resolve(path.join(srcDir, 'brave', 'android', 'java', 'string', 'android_brave_strings.grd'))
const braveAndroidBraveStringsPath = path.resolve(path.join(srcDir, 'brave', 'android', 'java', 'strings', 'android_brave_strings.grd'))

const srcGit = path.resolve(path.join(srcDir, '.git'))

Expand Down
6 changes: 4 additions & 2 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ const util = {
const chromeBrowserResourcesDir = path.join(config.srcDir, 'chrome', 'browser', 'resources')
const braveBrowserResourcesDir = path.join(config.projects['brave-core'].dir, 'browser', 'resources')
const braveAppVectorIconsDir = path.join(config.projects['brave-core'].dir, 'vector_icons', 'chrome', 'app')
const chromeAndroidDir = path.join(config.srcDir, 'chrome', 'android')
const braveAndroidDir = path.join(config.projects['brave-core'].dir, 'android')
const chromeAndroidJavaStringsTranslationsDir = path.join(config.srcDir, 'chrome', 'android', 'java', 'strings', 'translations')
const braveAndroidJavaStringsTranslationsDir = path.join(config.projects['brave-core'].dir, 'android', 'java', 'strings', 'translations')

let fileMap = new Set();
// The following 3 entries we map to the same name, not the chromium equivalent name for copying back
Expand All @@ -162,8 +162,10 @@ const util = {
// brave/app/resources/chromium_strings*.xtb
// brave/app/resources/generated_resoruces*.xtb
// brave/components/strings/components_chromium_strings*.xtb
// brave/android/java/strings/translations/android_chrome_strings*.xtb
fileMap.add([path.join(braveAppDir, 'resources'), path.join(chromeAppDir, 'resources')])
fileMap.add([path.join(braveComponentsDir, 'strings'), path.join(chromeComponentsDir, 'strings')])
fileMap.add([braveAndroidJavaStringsTranslationsDir, chromeAndroidJavaStringsTranslationsDir])
// By overwriting, we don't need to modify some grd files.
fileMap.add([path.join(braveAppDir, 'theme', 'brave'), path.join(chromeAppDir, 'theme', 'brave')])
fileMap.add([path.join(braveAppDir, 'theme', 'brave'), path.join(chromeAppDir, 'theme', 'chromium')])
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "78.0.3904.108",
"tag": "79.0.3945.45",
"repository": {
"url": "https://chromium.googlesource.com/chromium/src.git"
},
Expand All @@ -43,7 +43,7 @@
},
"brave-core": {
"dir": "src/brave",
"branch": "master",
"branch": "79.0.3945.45",
"repository": {
"url": "https://github.com/brave/brave-core.git"
}
Expand Down