base/base.gyp - Issue 10913083: Remove {base,net}_java dependencies from GYP client targets on Android.

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

Issue 10913083: Remove {base,net}_java dependencies from GYP client targets on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Peter's comment Created 8 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: base/base.gyp

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

index 682eec16d0e5e4374808bd08a012571a5d11a91f..853fc843c2ab9b47e152b5e2f4f503c4698356be 100644

--- a/base/base.gyp

+++ b/base/base.gyp

@@ -122,10 +122,11 @@

}],

'dependencies': [

+ 'base_java',

+ 'base_jni_headers',

'symbolize',

'../third_party/ashmem/ashmem.gyp:ashmem',

'../third_party/icu/icu.gyp:icuuc',

- 'base_jni_headers',

'include_dirs': [

'<(SHARED_INTERMEDIATE_DIR)/base',

@@ -141,6 +142,9 @@

'sources!': [

'debug/stack_trace_posix.cc',

+ 'export_dependent_settings': [

+ 'base_java',

+ ],

}],

['os_bsd==1', {

'include_dirs': [

« no previous file with comments | « no previous file | build/apk_test.gypi » ('j') | build/apk_test.gypi » ('J')