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

Side by Side Diff: chrome/chrome_android.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: 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 | « build/jni_generator.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 (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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 'package_name': 'chromium_testshell', 7 'package_name': 'chromium_testshell',
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'chrome_android_paks.gypi', # Included for the list of pak resources. 10 'chrome_android_paks.gypi', # Included for the list of pak resources.
(...skipping 14 matching lines...) Expand all
25 # JNI_OnLoad is exported. 25 # JNI_OnLoad is exported.
26 'app/android/chrome_jni_onload.cc', 26 'app/android/chrome_jni_onload.cc',
27 'android/testshell/chrome_main_delegate_testshell_android.cc', 27 'android/testshell/chrome_main_delegate_testshell_android.cc',
28 'android/testshell/chrome_main_delegate_testshell_android.h', 28 'android/testshell/chrome_main_delegate_testshell_android.h',
29 "android/testshell/testshell_google_location_settings_helper.cc", 29 "android/testshell/testshell_google_location_settings_helper.cc",
30 "android/testshell/testshell_google_location_settings_helper.h", 30 "android/testshell/testshell_google_location_settings_helper.h",
31 'android/testshell/testshell_tab.cc', 31 'android/testshell/testshell_tab.cc',
32 'android/testshell/testshell_tab.h', 32 'android/testshell/testshell_tab.h',
33 ], 33 ],
34 'include_dirs': [ 34 'include_dirs': [
35 '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell',
36 '../skia/config', 35 '../skia/config',
37 ], 36 ],
38 'conditions': [ 37 'conditions': [
39 [ 'order_profiling!=0', { 38 [ 'order_profiling!=0', {
40 'conditions': [ 39 'conditions': [
41 [ 'OS=="android"', { 40 [ 'OS=="android"', {
42 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], 41 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
43 }], 42 }],
44 ], 43 ],
45 }], 44 }],
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 'chrome.gyp:browser', 102 'chrome.gyp:browser',
104 'chrome.gyp:browser_ui', 103 'chrome.gyp:browser_ui',
105 'chrome.gyp:plugin', 104 'chrome.gyp:plugin',
106 'chrome.gyp:renderer', 105 'chrome.gyp:renderer',
107 'chrome.gyp:utility', 106 'chrome.gyp:utility',
108 '../content/content.gyp:content', 107 '../content/content.gyp:content',
109 '../content/content.gyp:content_app_browser', 108 '../content/content.gyp:content_app_browser',
110 ], 109 ],
111 'include_dirs': [ 110 'include_dirs': [
112 '..', 111 '..',
113 '<(SHARED_INTERMEDIATE_DIR)/android',
114 '<(SHARED_INTERMEDIATE_DIR)/chrome',
115 '<(android_ndk_include)', 112 '<(android_ndk_include)',
116 ], 113 ],
117 'sources': [ 114 'sources': [
118 'app/android/chrome_android_initializer.cc', 115 'app/android/chrome_android_initializer.cc',
119 'app/android/chrome_android_initializer.h', 116 'app/android/chrome_android_initializer.h',
120 'app/android/chrome_main_delegate_android.cc', 117 'app/android/chrome_main_delegate_android.cc',
121 'app/android/chrome_main_delegate_android.h', 118 'app/android/chrome_main_delegate_android.h',
122 'app/chrome_main_delegate.cc', 119 'app/chrome_main_delegate.cc',
123 'app/chrome_main_delegate.h', 120 'app/chrome_main_delegate.h',
124 ], 121 ],
(...skipping 15 matching lines...) Expand all
140 { 137 {
141 'destination': '<(chrome_android_pak_output_folder)', 138 'destination': '<(chrome_android_pak_output_folder)',
142 'files': [ 139 'files': [
143 '<@(chrome_android_pak_input_resources)', 140 '<@(chrome_android_pak_input_resources)',
144 ], 141 ],
145 } 142 }
146 ], 143 ],
147 }, 144 },
148 ], 145 ],
149 } 146 }
OLDNEW
« no previous file with comments | « build/jni_generator.gypi ('k') | components/autofill.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698