chrome/chrome.gyp - Issue 1198193006: Revert "Revert "Android: Store language .pak files in res/raw rather than assets""

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome.gyp

Issue 1198193006: Revert "Revert "Android: Store language .pak files in res/raw rather than assets"" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java ('k') | chrome/chrome_android_paks.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome.gyp

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp

index a5bbd9477618e7109e8f86c12a3ec830d412058f..633b8a25a0fae84178cb72450f00b40bb0922cd1 100644

--- a/chrome/chrome.gyp

+++ b/chrome/chrome.gyp

@@ -575,6 +575,7 @@

'type': 'none',

'dependencies': [

'activity_type_ids_java',

+ 'chrome_locale_paks',

'chrome_resources.gyp:chrome_strings',

'chrome_strings_grd',

'chrome_version_java',

@@ -644,6 +645,18 @@

{

+ # GN: //chrome/android:chrome_locale_paks

+ 'target_name': 'chrome_locale_paks',

+ 'type': 'none',

+ 'variables': {

+ 'locale_pak_files': [ '<@(chrome_android_pak_locale_resources)' ],

+ },

+ 'includes': [

+ 'chrome_android_paks.gypi',

+ '../build/android/locale_pak_resources.gypi',

+ ],

+ },

+ {

# GN: //chrome:content_setting_javagen

'target_name': 'content_setting_java',

'type': 'none',