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

Side by Side Diff: net/net.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 | « mojo/mojo.gyp ('k') | printing/printing.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 2914 matching lines...) Expand 10 before | Expand all | Expand 10 after
2925 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 2925 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
2926 'android/java/src/org/chromium/net/GURLUtils.java', 2926 'android/java/src/org/chromium/net/GURLUtils.java',
2927 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 2927 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
2928 'android/java/src/org/chromium/net/ProxyChangeListener.java', 2928 'android/java/src/org/chromium/net/ProxyChangeListener.java',
2929 'android/java/src/org/chromium/net/X509Util.java', 2929 'android/java/src/org/chromium/net/X509Util.java',
2930 ], 2930 ],
2931 'variables': { 2931 'variables': {
2932 'jni_gen_package': 'net', 2932 'jni_gen_package': 'net',
2933 'jni_generator_ptr_type': 'long', 2933 'jni_generator_ptr_type': 'long',
2934 }, 2934 },
2935 'direct_dependent_settings': {
2936 'include_dirs': [
2937 '<(SHARED_INTERMEDIATE_DIR)/net',
2938 ],
2939 },
2940 'includes': [ '../build/jni_generator.gypi' ], 2935 'includes': [ '../build/jni_generator.gypi' ],
2941 }, 2936 },
2942 { 2937 {
2943 'target_name': 'net_test_jni_headers', 2938 'target_name': 'net_test_jni_headers',
2944 'type': 'none', 2939 'type': 'none',
2945 'sources': [ 2940 'sources': [
2946 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java ', 2941 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java ',
2947 ], 2942 ],
2948 'variables': { 2943 'variables': {
2949 'jni_gen_package': 'net', 2944 'jni_gen_package': 'net',
2950 'jni_generator_ptr_type': 'long', 2945 'jni_generator_ptr_type': 'long',
2951 }, 2946 },
2952 'direct_dependent_settings': {
2953 'include_dirs': [
2954 '<(SHARED_INTERMEDIATE_DIR)/net',
2955 ],
2956 },
2957 'includes': [ '../build/jni_generator.gypi' ], 2947 'includes': [ '../build/jni_generator.gypi' ],
2958 }, 2948 },
2959 { 2949 {
2960 'target_name': 'net_java', 2950 'target_name': 'net_java',
2961 'type': 'none', 2951 'type': 'none',
2962 'variables': { 2952 'variables': {
2963 'java_in_dir': '../net/android/java', 2953 'java_in_dir': '../net/android/java',
2964 }, 2954 },
2965 'dependencies': [ 2955 'dependencies': [
2966 '../base/base.gyp:base', 2956 '../base/base.gyp:base',
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
3091 'net_unittests.isolate', 3081 'net_unittests.isolate',
3092 ], 3082 ],
3093 'sources': [ 3083 'sources': [
3094 'net_unittests.isolate', 3084 'net_unittests.isolate',
3095 ], 3085 ],
3096 }, 3086 },
3097 ], 3087 ],
3098 }], 3088 }],
3099 ], 3089 ],
3100 } 3090 }
OLDNEW
« no previous file with comments | « mojo/mojo.gyp ('k') | printing/printing.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698