roll up of misc. gn work

url/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("//testing/test.gni")
 import("//url/config.gni")
 
 # Sets the USE_ICU_ALTERNATIVES_ON_ANDROID define based on the build flag.
 config("url_icu_config") {
   if (use_icu_alternatives_on_android) {
@@ skipping 48 matching lines @@
   defines = [ "URL_IMPLEMENTATION" ]
 
   configs += [ ":url_icu_config" ]
 
   if (is_win) {
     cflags = [ "/wd4267" ]  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   }
 
   deps = [
     "//base",
-    "//base/third_party/dynamic_annotations",
     "//third_party/icu:icudata",
     "//third_party/icu",
   ]
 
+  if (!is_nacl) {
+    deps += [ "//base/third_party/dynamic_annotations" ]
+  }
+
   if (use_icu_alternatives_on_android) {
     sources -= [
       "url_canon_icu.cc",
       "url_canon_icu.h",
     ]
     deps -= [
       "//third_party/icu:icudata",
       "//third_party/icu",
     ]
 
@@ skipping 37 matching lines @@
       "//testing/gtest",
       "//third_party/icu:icuuc",
     ]
 
     if (use_icu_alternatives_on_android) {
       sources -= [ "url_canon_icu_unittest.cc" ]
       deps -= [ "//third_party/icu:icuuc" ]
     }
   }
 }