chrome/chrome_repack_resources.gypi - Issue 673663004: Android: Do not build any extensions code except for extensions_constants.

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_repack_resources.gypi

Issue 673663004: Android: Do not build any extensions code except for extensions_constants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@zoom_controller

Patch Set: fix merge conflict Created 6 years, 2 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: chrome/chrome_repack_resources.gypi

diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi

index a3ebfab69b871b2ef22a37dedaa4769e7ed166ed..e7ba8c2d298aa3c25b9a6240436424a28b3c6473 100644

--- a/chrome/chrome_repack_resources.gypi

+++ b/chrome/chrome_repack_resources.gypi

@@ -31,8 +31,6 @@

'<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',

'<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',

'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',

- '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak',

- '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',

}],

['OS != "ios" and OS != "android"', {

@@ -47,6 +45,8 @@

}],

['enable_extensions==1', {

'pak_inputs': [

+ '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',

'<(grit_out_dir)/extensions_api_resources.pak',

}],

« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »