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

Side by Side Diff: base/base.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 | « base/android/jni_generator/jni_generator.gyp ('k') | build/jni_generator.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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 ['target_arch == "mipsel"', { 139 ['target_arch == "mipsel"', {
140 'sources/': [ 140 'sources/': [
141 ['include', '^atomicops_internals_mips_gcc\\.cc$'], 141 ['include', '^atomicops_internals_mips_gcc\\.cc$'],
142 ], 142 ],
143 }], 143 }],
144 ], 144 ],
145 'dependencies': [ 145 'dependencies': [
146 'base_jni_headers', 146 'base_jni_headers',
147 '../third_party/ashmem/ashmem.gyp:ashmem', 147 '../third_party/ashmem/ashmem.gyp:ashmem',
148 ], 148 ],
149 'include_dirs': [
150 '<(SHARED_INTERMEDIATE_DIR)/base',
151 ],
152 'link_settings': { 149 'link_settings': {
153 'libraries': [ 150 'libraries': [
154 '-llog', 151 '-llog',
155 ], 152 ],
156 }, 153 },
157 'sources!': [ 154 'sources!': [
158 'debug/stack_trace_posix.cc', 155 'debug/stack_trace_posix.cc',
159 ], 156 ],
160 'includes': [ 157 'includes': [
161 '../build/android/cpufeatures.gypi', 158 '../build/android/cpufeatures.gypi',
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 ['os_bsd==1', { 895 ['os_bsd==1', {
899 'sources!': [ 896 'sources!': [
900 'test/test_file_util_linux.cc', 897 'test/test_file_util_linux.cc',
901 ], 898 ],
902 }], 899 }],
903 ['OS == "android"', { 900 ['OS == "android"', {
904 'dependencies': [ 901 'dependencies': [
905 'base_unittests_jni_headers', 902 'base_unittests_jni_headers',
906 'base_java_unittest_support', 903 'base_java_unittest_support',
907 ], 904 ],
908 'include_dirs': [
909 '<(SHARED_INTERMEDIATE_DIR)/base',
910 ],
911 }], 905 }],
912 ], 906 ],
913 'sources': [ 907 'sources': [
914 'test/expectations/expectation.cc', 908 'test/expectations/expectation.cc',
915 'test/expectations/expectation.h', 909 'test/expectations/expectation.h',
916 'test/expectations/parser.cc', 910 'test/expectations/parser.cc',
917 'test/expectations/parser.h', 911 'test/expectations/parser.h',
918 'test/gtest_xml_util.cc', 912 'test/gtest_xml_util.cc',
919 'test/gtest_xml_util.h', 913 'test/gtest_xml_util.h',
920 'test/launcher/test_launcher.cc', 914 'test/launcher/test_launcher.cc',
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 'base_unittests.isolate', 1394 'base_unittests.isolate',
1401 ], 1395 ],
1402 'sources': [ 1396 'sources': [
1403 'base_unittests.isolate', 1397 'base_unittests.isolate',
1404 ], 1398 ],
1405 }, 1399 },
1406 ], 1400 ],
1407 }], 1401 }],
1408 ], 1402 ],
1409 } 1403 }
OLDNEW
« no previous file with comments | « base/android/jni_generator/jni_generator.gyp ('k') | build/jni_generator.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698