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

Side by Side Diff: net/BUILD.gn

Issue 1526183002: Revert of [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « build/java_apk.gypi ('k') | net/android/BUILD.gn » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 import("//build/config/chromecast_build.gni") 5 import("//build/config/chromecast_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//build_overrides/v8.gni") 10 import("//build_overrides/v8.gni")
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 "android/java/src/org/chromium/net/NetworkChangeNotifier.java", 1202 "android/java/src/org/chromium/net/NetworkChangeNotifier.java",
1203 "android/java/src/org/chromium/net/ProxyChangeListener.java", 1203 "android/java/src/org/chromium/net/ProxyChangeListener.java",
1204 "android/java/src/org/chromium/net/X509Util.java", 1204 "android/java/src/org/chromium/net/X509Util.java",
1205 ] 1205 ]
1206 jni_package = "net" 1206 jni_package = "net"
1207 } 1207 }
1208 generate_jni("net_test_jni_headers") { 1208 generate_jni("net_test_jni_headers") {
1209 sources = [ 1209 sources = [
1210 "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java", 1210 "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
1211 "test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator .java", 1211 "test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator .java",
1212 "test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.j ava", 1212 "test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java" ,
1213 ] 1213 ]
1214 jni_package = "net/test" 1214 jni_package = "net/test"
1215 } 1215 }
1216 } 1216 }
1217 1217
1218 if (is_android || is_linux) { 1218 if (is_android || is_linux) {
1219 executable("disk_cache_memory_test") { 1219 executable("disk_cache_memory_test") {
1220 testonly = true 1220 testonly = true
1221 sources = [ 1221 sources = [
1222 "tools/disk_cache_memory_test/disk_cache_memory_test.cc", 1222 "tools/disk_cache_memory_test/disk_cache_memory_test.cc",
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
1688 if (enable_websockets) { 1688 if (enable_websockets) {
1689 sources += [ "websockets/websocket_frame_perftest.cc" ] 1689 sources += [ "websockets/websocket_frame_perftest.cc" ]
1690 } 1690 }
1691 1691
1692 if (use_v8_in_net) { 1692 if (use_v8_in_net) {
1693 deps += [ ":net_with_v8" ] 1693 deps += [ ":net_with_v8" ]
1694 } else { 1694 } else {
1695 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1695 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1696 } 1696 }
1697 } 1697 }
OLDNEW
« no previous file with comments | « build/java_apk.gypi ('k') | net/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698