extensions/extensions.gyp - 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: extensions/extensions.gyp

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: extensions/extensions.gyp

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

index 823819285fb15f1f643daf5475c97ec425d6ac5d..dca4307954adf02777834227502105ca11dbc4e4 100644

--- a/extensions/extensions.gyp

+++ b/extensions/extensions.gyp

@@ -98,7 +98,6 @@

'common/extension.h',

'common/extension_api.cc',

'common/extension_api.h',

- 'common/extension_api_stub.cc',

'common/extension_icon_set.cc',

'common/extension_icon_set.h',

'common/extension_l10n_util.cc',

@@ -267,9 +266,6 @@

'../device/serial/serial.gyp:device_serial_mojo',

'../device/usb/usb.gyp:device_usb',

- 'sources!': [

- 'common/extension_api_stub.cc',

- ],

}, { # enable_extensions == 0

'sources!': [

'common/api/bluetooth/bluetooth_manifest_data.cc',

« no previous file with comments | « extensions/common/extension_api_stub.cc ('k') | no next file » | no next file with comments »