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

Side by Side Diff: net/net.gyp

Issue 10913083: Remove {base,net}_java dependencies from GYP client targets on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months 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 | « media/media.gyp ('k') | sql/sql.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 (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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 'websockets/websocket_throttle.cc', 813 'websockets/websocket_throttle.cc',
814 'websockets/websocket_throttle.h', 814 'websockets/websocket_throttle.h',
815 ], 815 ],
816 'defines': [ 816 'defines': [
817 'NET_IMPLEMENTATION', 817 'NET_IMPLEMENTATION',
818 ], 818 ],
819 'export_dependent_settings': [ 819 'export_dependent_settings': [
820 '../base/base.gyp:base', 820 '../base/base.gyp:base',
821 ], 821 ],
822 'conditions': [ 822 'conditions': [
823 ['OS=="android" and _toolset=="target"', {
Peter Beverloo 2012/09/06 10:09:09 The OS==* conditions in this block start around li
Philippe 2012/09/06 15:49:46 Done.
824 'dependencies': [
825 'net_java',
826 ],
827 'export_dependent_settings': [
828 'net_java',
829 ],
830 }],
823 ['chromeos==1', { 831 ['chromeos==1', {
824 'sources!': [ 832 'sources!': [
825 'base/network_change_notifier_linux.cc', 833 'base/network_change_notifier_linux.cc',
826 'base/network_change_notifier_linux.h', 834 'base/network_change_notifier_linux.h',
827 'base/network_change_notifier_netlink_linux.cc', 835 'base/network_change_notifier_netlink_linux.cc',
828 'base/network_change_notifier_netlink_linux.h', 836 'base/network_change_notifier_netlink_linux.h',
829 'proxy/proxy_config_service_linux.cc', 837 'proxy/proxy_config_service_linux.cc',
830 'proxy/proxy_config_service_linux.h', 838 'proxy/proxy_config_service_linux.h',
831 ], 839 ],
832 }], 840 }],
(...skipping 1238 matching lines...) Expand 10 before | Expand all | Expand 10 after
2071 'includes': [ '../build/jni_generator.gypi' ], 2079 'includes': [ '../build/jni_generator.gypi' ],
2072 }, 2080 },
2073 { 2081 {
2074 'target_name': 'net_java', 2082 'target_name': 'net_java',
2075 'type': 'none', 2083 'type': 'none',
2076 'variables': { 2084 'variables': {
2077 'package_name': 'net', 2085 'package_name': 'net',
2078 'java_in_dir': '../net/android/java', 2086 'java_in_dir': '../net/android/java',
2079 }, 2087 },
2080 'dependencies': [ 2088 'dependencies': [
2081 '../base/base.gyp:base_java', 2089 '../base/base.gyp:base',
2082 ], 2090 ],
2083 'export_dependent_settings': [ 2091 'export_dependent_settings': [
2084 '../base/base.gyp:base_java', 2092 '../base/base.gyp:base',
2085 ], 2093 ],
2086 'includes': [ '../build/java.gypi' ], 2094 'includes': [ '../build/java.gypi' ],
2087 }, 2095 },
2088 { 2096 {
2089 'target_name': 'net_javatests', 2097 'target_name': 'net_javatests',
2090 'type': 'none', 2098 'type': 'none',
2091 'variables': { 2099 'variables': {
2092 'package_name': 'net_javatests', 2100 'package_name': 'net_javatests',
2093 'java_in_dir': '../net/android/javatests', 2101 'java_in_dir': '../net/android/javatests',
2094 }, 2102 },
2095 'dependencies': [ 2103 'dependencies': [
2096 '../base/base.gyp:base_java', 2104 '../base/base.gyp:base',
2097 '../base/base.gyp:base_java_test_support', 2105 '../base/base.gyp:base_java_test_support',
2106 'net_java',
2098 ], 2107 ],
2099 'export_dependent_settings': [ 2108 'export_dependent_settings': [
2100 '../base/base.gyp:base_java', 2109 '../base/base.gyp:base',
2101 '../base/base.gyp:base_java_test_support', 2110 '../base/base.gyp:base_java_test_support',
2111 'net_java',
2102 ], 2112 ],
2103 'includes': [ '../build/java.gypi' ], 2113 'includes': [ '../build/java.gypi' ],
2104 }, 2114 },
2105 ], 2115 ],
2106 }], 2116 }],
2107 # Special target to wrap a gtest_target_type==shared_library 2117 # Special target to wrap a gtest_target_type==shared_library
2108 # net_unittests into an android apk for execution. 2118 # net_unittests into an android apk for execution.
2109 # See base.gyp for TODO(jrg)s about this strategy. 2119 # See base.gyp for TODO(jrg)s about this strategy.
2110 ['OS == "android" and gtest_target_type == "shared_library"', { 2120 ['OS == "android" and gtest_target_type == "shared_library"', {
2111 'targets': [ 2121 'targets': [
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
2180 '--result', '<@(_outputs)', 2190 '--result', '<@(_outputs)',
2181 '--isolate', 'net_unittests.isolate', 2191 '--isolate', 'net_unittests.isolate',
2182 ], 2192 ],
2183 }, 2193 },
2184 ], 2194 ],
2185 }, 2195 },
2186 ], 2196 ],
2187 }], 2197 }],
2188 ], 2198 ],
2189 } 2199 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | sql/sql.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698