Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(320)

Side by Side 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: Remove export_dependent_settings 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_tests.gypi ('k') | mojo/mojo.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 'MEDIA_DISABLE_LIBVPX', 540 'MEDIA_DISABLE_LIBVPX',
541 ], 541 ],
542 }, 542 },
543 # Exclude the sources that depend on libvpx. 543 # Exclude the sources that depend on libvpx.
544 'sources!': [ 544 'sources!': [
545 'filters/vpx_video_decoder.cc', 545 'filters/vpx_video_decoder.cc',
546 'filters/vpx_video_decoder.h', 546 'filters/vpx_video_decoder.h',
547 ], 547 ],
548 }], 548 }],
549 ['OS=="android"', { 549 ['OS=="android"', {
550 'include_dirs': [
551 '<(SHARED_INTERMEDIATE_DIR)/media',
552 ],
553 'dependencies': [ 550 'dependencies': [
554 'media_android_jni_headers', 551 'media_android_jni_headers',
555 'player_android', 552 'player_android',
556 'video_capture_android_jni_headers', 553 'video_capture_android_jni_headers',
557 ], 554 ],
558 'sources': [ 555 'sources': [
559 'base/media.cc', 556 'base/media.cc',
560 'base/media.h', 557 'base/media.h',
561 'base/media_stub.cc', 558 'base/media_stub.cc',
562 ], 559 ],
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 ], 1534 ],
1538 'dependencies': [ 1535 'dependencies': [
1539 '../base/base.gyp:base', 1536 '../base/base.gyp:base',
1540 '../ui/gl/gl.gyp:gl', 1537 '../ui/gl/gl.gyp:gl',
1541 '../url/url.gyp:url_lib', 1538 '../url/url.gyp:url_lib',
1542 'media_android_jni_headers', 1539 'media_android_jni_headers',
1543 ], 1540 ],
1544 'defines': [ 1541 'defines': [
1545 'MEDIA_IMPLEMENTATION', 1542 'MEDIA_IMPLEMENTATION',
1546 ], 1543 ],
1547 'include_dirs': [
1548 '<(SHARED_INTERMEDIATE_DIR)/media',
1549 ],
1550 }, 1544 },
1551 { 1545 {
1552 'target_name': 'media_java', 1546 'target_name': 'media_java',
1553 'type': 'none', 1547 'type': 'none',
1554 'dependencies': [ 1548 'dependencies': [
1555 '../base/base.gyp:base', 1549 '../base/base.gyp:base',
1556 'media_android_imageformat_list', 1550 'media_android_imageformat_list',
1557 ], 1551 ],
1558 'export_dependent_settings': [ 1552 'export_dependent_settings': [
1559 '../base/base.gyp:base', 1553 '../base/base.gyp:base',
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
1640 ], 1634 ],
1641 }], 1635 }],
1642 ], 1636 ],
1643 }], 1637 }],
1644 ], 1638 ],
1645 }, 1639 },
1646 ], 1640 ],
1647 }], 1641 }],
1648 ], 1642 ],
1649 } 1643 }
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | mojo/mojo.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698