media/media.gyp - Issue 111493006: Have jni_generator.gypi specify include_dirs to dependent targets.

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

Issue 111493006: Have jni_generator.gypi specify include_dirs to dependent targets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Change native_test_launcher to use canonical jni include path Created 7 years ago

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

Jump to:

Index: media/media.gyp

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

index 97e2f5dfba90ce5ccd4dd25dd947f462c85cea44..fb844de78b8dfcd7121be508d09ef00e6bee3386 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -547,9 +547,6 @@

}],

['OS=="android"', {

- 'include_dirs': [

- '<(SHARED_INTERMEDIATE_DIR)/media',

- ],

'dependencies': [

'media_android_jni_headers',

'player_android',

@@ -1544,9 +1541,6 @@

'defines': [

'MEDIA_IMPLEMENTATION',

- 'include_dirs': [

- '<(SHARED_INTERMEDIATE_DIR)/media',

- ],

{

'target_name': 'media_java',