content/shell/BUILD.gn - Issue 569923003: Make content_shell_apk build completely

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: content/shell/BUILD.gn

Issue 569923003: Make content_shell_apk build completely (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-fix-apk-resources

Patch Set: Created 6 years, 3 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

Index: content/shell/BUILD.gn

diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn

index 26765c68ec923075bbe8bab8e04823de820b8713..bfb2927f0fd16a3d5c018d7e236fab9d7eee9360 100644

--- a/content/shell/BUILD.gn

+++ b/content/shell/BUILD.gn

@@ -427,13 +427,9 @@ repack("pak") {

"//ui/strings",

]

- if (is_android) {

- output = "$root_out_dir/content_shell/assets/content_shell.pak"

- } else {

- sources += [ "$root_gen_dir/webkit/devtools_resources.pak" ]

- deps += [ "//content/browser/devtools:resources" ]

- output = "$root_out_dir/content_shell.pak"

- }

+ sources += [ "$root_gen_dir/webkit/devtools_resources.pak" ]

+ deps += [ "//content/browser/devtools:resources" ]

+ output = "$root_out_dir/content_shell.pak"

}

# TODO(GYP): Figure out what this should be on android

« build/config/android/internal_rules.gni ('K') | « content/renderer/BUILD.gn ('k') | content/shell/android/BUILD.gn » ('j') | content/shell/android/BUILD.gn » ('J')