GN: Fix up net_unittests to match GYP

net/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build_overrides/v8.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("//tools/grit/grit_rule.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 } else if (is_mac) {
   import("//build/config/mac/mac_sdk.gni")
 }
 
 # The list of net files is kept in net.gypi. Read it.
 gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ rebase_path("net.gypi") ],
                           "scope",
                           [ "net.gypi" ])
 
-# Disable Kerberos on ChromeOS, Android, iOS, and Chromecast, at least for now.
+# Disable Kerberos on ChromeOS, iOS, and Chromecast, at least for now.
 # It needs configuration (krb5.conf and so on).
-use_kerberos = !is_chromeos && !is_android && !is_ios && !is_chromecast
+use_kerberos = !is_chromeos && !is_ios && !is_chromecast
 
 # The way the cache uses mmap() is inefficient on some Android devices. If
 # this flag is set, we hackily avoid using mmap() in the disk cache. We are
 # pretty confident that mmap-ing the index would not hurt any existing x86
 # android devices, but we cannot be so sure about the variety of ARM devices.
 # So enable it for x86 only for now.
 posix_avoid_mmap = is_android && current_cpu != "x86"
 
 # WebSockets and socket stream code are used everywhere except iOS.
 enable_websockets = !is_ios
@@ skipping 187 matching lines @@
       net_shared_sources -= [ "base/openssl_private_key_store_android.cc" ]
     }
   } else {
     if (is_android) {
       # Android doesn't use these even when using OpenSSL.
       net_shared_sources -= [
         "base/openssl_private_key_store_memory.cc",
         "cert/cert_database_openssl.cc",
         "cert/cert_verify_proc_openssl.cc",
         "cert/test_root_certs_openssl.cc",
+        "http/http_auth_gssapi_posix.cc",
+        "http/http_auth_gssapi_posix.h",
       ]
     }
   }
 
   if (use_glib && use_gconf && !is_chromeos) {
     net_shared_configs += [ "//build/config/linux:gconf" ]
     net_shared_deps += [ "//build/linux:gio" ]
   }
 
   if (is_linux) {
@@ skipping 940 matching lines @@
       "android/java/src/org/chromium/net/NetworkChangeNotifier.java",
       "android/java/src/org/chromium/net/ProxyChangeListener.java",
       "android/java/src/org/chromium/net/X509Util.java",
     ]
     jni_package = "net"
   }
   generate_jni("net_test_jni_headers") {
     sources = [
       "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
       "test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
+      "test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java",
     ]
     jni_package = "net/test"
   }
+
+  _net_unittests_apk_assets_dir = "$root_build_dir/net_unittests_apk/assets"

[pkotwicz, 2015/10/22 17:39:16]

Nit: root_out_dir here too?

[agrieve, 2015/10/22 19:56:26]

Done.

+
+  copy_ex("copy_net_unittests_apk_assets") {
+    clear_dir = true
+    dest = _net_unittests_apk_assets_dir
+
+    if (v8_use_external_startup_data) {
+      sources = [
+        "$root_out_dir/natives_blob.bin",
+        "$root_out_dir/snapshot_blob.bin",
+      ]
+      deps = [
+        "//v8",
+      ]
+    }
+  }
 }
 
 if (is_android || is_linux) {
   executable("disk_cache_memory_test") {
     testonly = true
     sources = [
       "tools/disk_cache_memory_test/disk_cache_memory_test.cc",
     ]
     deps = [
       ":net",
@@ skipping 363 matching lines @@
       # OS is not "linux" or "freebsd" or "openbsd".
       "socket/unix_domain_client_socket_posix_unittest.cc",
       "socket/unix_domain_server_socket_posix_unittest.cc",
 
       # See bug http://crbug.com/344533.
       "disk_cache/blockfile/index_table_v3_unittest.cc",
     ]
   }
 
   if (is_android) {
+    apk_deps = [
+      "//base:base_java_unittest_support",
+      "//net/android:net_java",
+      "//net/android:net_javatests",
+      "//net/android:net_java_test_support",
+      "//net/android:net_unittests_apk_resources",
+      ":copy_net_unittests_apk_assets",
+    ]
+    android_manifest = "//net/android/unittest_support/AndroidManifest.xml"
     sources -= [
       # See bug http://crbug.com/344533.
       "disk_cache/blockfile/index_table_v3_unittest.cc",
-      "dns/dns_config_service_posix_unittest.cc",
     ]
     deps += [
       ":net_test_jni_headers",
 
       # TODO(mmenke):  This depends on test_support_base, which depends on
       #                icu.  Figure out a way to remove that dependency.
       "//testing/android/native_test:native_test_native_code",
     ]
     set_sources_assignment_filter([])
     sources += [ "base/address_tracker_linux_unittest.cc" ]
     set_sources_assignment_filter(sources_assignment_filter)
+    apk_asset_location = _net_unittests_apk_assets_dir
     isolate_file = "net_unittests.isolate"
   }
 
   # Symbols for crashes when running tests on swarming.
   if (symbol_level > 0) {
     if (is_win) {
       data += [ "$root_out_dir/net_unittests.exe.pdb" ]
     } else if (is_mac) {
       data += [ "$root_out_dir/net_unittests.dSYM/" ]
     }
@@ skipping 30 matching lines @@
   if (enable_websockets) {
     sources += [ "websockets/websocket_frame_perftest.cc" ]
   }
 
   if (use_v8_in_net) {
     deps += [ ":net_with_v8" ]
   } else {
     sources -= [ "proxy/proxy_resolver_perftest.cc" ]
   }
 }