summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorblundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-17 08:31:34 +0000
committerblundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-17 08:31:34 +0000
commit3badbfbc76ac6bcf03cfa93ed21c48632cbaab01 (patch)
treeb2f7706305c6a8dac263f33e37e42ec615f7752f /media
parent3c5dfe8c9d42a5483fa426d3237fe99b88f10601 (diff)
downloadchromium_src-3badbfbc76ac6bcf03cfa93ed21c48632cbaab01.zip
chromium_src-3badbfbc76ac6bcf03cfa93ed21c48632cbaab01.tar.gz
chromium_src-3badbfbc76ac6bcf03cfa93ed21c48632cbaab01.tar.bz2
Have jni_generator.gypi specify include_dirs to dependent targets.
Rather than each dependent target of a target that generates jni headers having to specify the appropriate include_dir manually, jni_generator.gypi can do it via direct_dependent_settings. TBR=darin@chromium.org Review URL: https://codereview.chromium.org/111493006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/media.gyp6
1 files changed, 0 insertions, 6 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 97e2f5d..fb844de 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',