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

Side by Side Diff: ui/ui.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 | « ui/gfx/gfx.gyp ('k') | no next file » | 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 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 'base/models/button_menu_item_model.cc', 563 'base/models/button_menu_item_model.cc',
564 'base/models/dialog_model.cc', 564 'base/models/dialog_model.cc',
565 'base/theme_provider.cc', 565 'base/theme_provider.cc',
566 'base/touch/touch_device.cc', 566 'base/touch/touch_device.cc',
567 'base/touch/touch_editing_controller.cc', 567 'base/touch/touch_editing_controller.cc',
568 'base/ui_base_types.cc', 568 'base/ui_base_types.cc',
569 ], 569 ],
570 'dependencies': [ 570 'dependencies': [
571 'ui_base_jni_headers', 571 'ui_base_jni_headers',
572 ], 572 ],
573 'include_dirs': [
574 '<(SHARED_INTERMEDIATE_DIR)/ui',
575 ],
576 'link_settings': { 573 'link_settings': {
577 'libraries': [ 574 'libraries': [
578 '-ljnigraphics', 575 '-ljnigraphics',
579 ], 576 ],
580 }, 577 },
581 }], 578 }],
582 ['OS=="android" and android_webview_build==0', { 579 ['OS=="android" and android_webview_build==0', {
583 'dependencies': [ 580 'dependencies': [
584 'android/ui_android.gyp:ui_java', 581 'android/ui_android.gyp:ui_java',
585 ], 582 ],
(...skipping 25 matching lines...) Expand all
611 ] 608 ]
612 } 609 }
613 }, 610 },
614 ], 611 ],
615 'conditions': [ 612 'conditions': [
616 ['OS=="android"' , { 613 ['OS=="android"' , {
617 'targets': [ 614 'targets': [
618 { 615 {
619 'target_name': 'ui_base_jni_headers', 616 'target_name': 'ui_base_jni_headers',
620 'type': 'none', 617 'type': 'none',
621 'direct_dependent_settings': {
622 'include_dirs': [
623 '<(SHARED_INTERMEDIATE_DIR)/ui',
624 ],
625 },
626 'sources': [ 618 'sources': [
627 'android/java/src/org/chromium/ui/base/Clipboard.java', 619 'android/java/src/org/chromium/ui/base/Clipboard.java',
628 'android/java/src/org/chromium/ui/base/LocalizationUtils.java', 620 'android/java/src/org/chromium/ui/base/LocalizationUtils.java',
629 'android/java/src/org/chromium/ui/base/SelectFileDialog.java', 621 'android/java/src/org/chromium/ui/base/SelectFileDialog.java',
630 'android/java/src/org/chromium/ui/base/ViewAndroid.java', 622 'android/java/src/org/chromium/ui/base/ViewAndroid.java',
631 'android/java/src/org/chromium/ui/base/WindowAndroid.java', 623 'android/java/src/org/chromium/ui/base/WindowAndroid.java',
632 ], 624 ],
633 'variables': { 625 'variables': {
634 'jni_gen_package': 'ui', 626 'jni_gen_package': 'ui',
635 'jni_generator_ptr_type': 'long', 627 'jni_generator_ptr_type': 'long',
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 'xcode_settings': { 683 'xcode_settings': {
692 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 684 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
693 }, 685 },
694 }], 686 }],
695 ], 687 ],
696 }, 688 },
697 ], 689 ],
698 }], 690 }],
699 ], 691 ],
700 } 692 }
OLDNEW
« no previous file with comments | « ui/gfx/gfx.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698