Skip to content

Commit

Permalink
Updated util.js to copy android XTB files.
Browse files Browse the repository at this point in the history
Fixes #6998
  • Loading branch information
mkarolin committed Nov 22, 2019
1 parent c007a59 commit ca9eb11
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions lib/util.js
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

0 comments on commit ca9eb11

Please sign in to comment.