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

Side by Side Diff: chrome/chrome_browser.gypi

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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_android.gypi ('k') | components/autofill.gypi » ('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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 3138 matching lines...) Expand 10 before | Expand all | Expand 10 after
3149 }], 3149 }],
3150 ['OS=="android"', { 3150 ['OS=="android"', {
3151 'dependencies': [ 3151 'dependencies': [
3152 '../components/components.gyp:web_contents_delegate_android', 3152 '../components/components.gyp:web_contents_delegate_android',
3153 'chrome_browser_jni_headers', 3153 'chrome_browser_jni_headers',
3154 ], 3154 ],
3155 'dependencies!': [ 3155 'dependencies!': [
3156 '../components/components.gyp:web_modal', 3156 '../components/components.gyp:web_modal',
3157 '../third_party/libusb/libusb.gyp:libusb', 3157 '../third_party/libusb/libusb.gyp:libusb',
3158 ], 3158 ],
3159 'export_dependent_settings': [
digit1 2013/12/16 16:25:09 Interesting, can you add a comment explaining why
blundell 2013/12/16 16:32:47 I included it because chrome_android_core (in chro
3160 'chrome_browser_jni_headers',
3161 ],
3159 'sources': [ 3162 'sources': [
3160 'browser/sessions/in_memory_tab_restore_service.cc', 3163 'browser/sessions/in_memory_tab_restore_service.cc',
3161 'browser/sessions/in_memory_tab_restore_service.h', 3164 'browser/sessions/in_memory_tab_restore_service.h',
3162 'browser/signin/android_profile_oauth2_token_service.cc', 3165 'browser/signin/android_profile_oauth2_token_service.cc',
3163 'browser/signin/android_profile_oauth2_token_service.h', 3166 'browser/signin/android_profile_oauth2_token_service.h',
3164 'browser/ssl/ssl_add_certificate_android.cc', 3167 'browser/ssl/ssl_add_certificate_android.cc',
3165 'browser/web_resource/notification_promo_mobile_ntp.cc', 3168 'browser/web_resource/notification_promo_mobile_ntp.cc',
3166 'browser/web_resource/notification_promo_mobile_ntp.h', 3169 'browser/web_resource/notification_promo_mobile_ntp.h',
3167 'browser/media/protected_media_identifier_infobar_delegate.cc', 3170 'browser/media/protected_media_identifier_infobar_delegate.cc',
3168 'browser/media/protected_media_identifier_infobar_delegate.h', 3171 'browser/media/protected_media_identifier_infobar_delegate.h',
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
3638 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3641 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3639 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3642 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3640 }, 3643 },
3641 'includes': [ '../build/android/java_cpp_template.gypi' ], 3644 'includes': [ '../build/android/java_cpp_template.gypi' ],
3642 }, 3645 },
3643 ], 3646 ],
3644 }, 3647 },
3645 ], 3648 ],
3646 ], 3649 ],
3647 } 3650 }
OLDNEW
« no previous file with comments | « chrome/chrome_android.gypi ('k') | components/autofill.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698