[Cronet] Adjust to Android M permissions model

components/cronet/android/BUILD.gn

 # Copyright 2015 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/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/version.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
@@ skipping 238 matching lines @@
     "api/src/org/chromium/net/UploadDataProviders.java",
     "api/src/org/chromium/net/UploadDataSink.java",
     "api/src/org/chromium/net/UrlRequest.java",
     "api/src/org/chromium/net/UrlRequestContextConfig.java",
     "api/src/org/chromium/net/UrlRequestException.java",
     "api/src/org/chromium/net/UrlResponseInfo.java",
     "api/src/org/chromium/net/UserAgent.java",
   ]
 
   deps = [
-    "//third_party/android_tools:android_support_annotations_javalib",
+    # Technically this target only needs to depend on
+    # android_support_annotations_javalib however it appears
+    # android_support_v13_java includes some duplicate definitions with
+    # android_support_annotations_javalib so build errors will result if this
+    # target pulls in android_support_annotations_javalib and targets dependent
+    # on this target pull in android_support_v13_java, so just pull in the
+    # superset android_support_v13_java here as it also contains the
+    # annotations.
+    "//third_party/android_tools:android_support_v13_java",
   ]
 
   srcjar_deps = [
     ":cronet_version_srcjar",
     ":http_cache_type_java",
     ":url_request_error_java",
     ":load_states_list",
     ":network_quality_observations_java",
   ]
 
@@ skipping 18 matching lines @@
     "java/src/org/chromium/net/urlconnection/CronetInputStream.java",
     "java/src/org/chromium/net/urlconnection/CronetOutputStream.java",
     "java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java",
     "java/src/org/chromium/net/urlconnection/MessageLoop.java",
   ]
 
   deps = [
     ":cronet_api",
     "//base:base_java",
     "//net/android:net_java",
-    "//third_party/android_tools:android_support_annotations_javalib",
+
+    # Technically this target only needs to depend on
+    # android_support_annotations_javalib however it appears
+    # android_support_v13_java includes some duplicate definitions with
+    # android_support_annotations_javalib so build errors will result if this
+    # target pulls in android_support_annotations_javalib and targets dependent
+    # on this target pull in android_support_v13_java, so just pull in the
+    # superset android_support_v13_java here as it also contains the
+    # annotations.
+    "//third_party/android_tools:android_support_v13_java",
     "//third_party/jsr-305:jsr_305_javalib",
   ]
 
   srcjar_deps = [
     ":chromium_url_request_java",
     ":net_request_priority_java",
   ]
 
   run_findbugs_override = true
 }
 
 android_resources("cronet_sample_apk_resources") {
   resource_dirs = [ "sample/res" ]
   android_manifest = "sample/AndroidManifest.xml"
 }
 
 android_library("cronet_sample_apk_java") {
   java_files = [
     "sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java",
     "sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java",
   ]
 
   deps = [
     ":cronet_api",
     ":cronet_java",
     ":cronet_sample_apk_resources",
     "//base:base_java",
+    "//third_party/android_tools:android_support_v13_java",
   ]
 
   run_findbugs_override = true
 }
 
 android_apk("cronet_sample_apk") {
   apk_name = "CronetSample"
   android_manifest = "sample/AndroidManifest.xml"
   native_libs = [ "libcronet.so" ]
 
@@ skipping 533 matching lines @@
     ":cronet_package_copy_native_lib",
     ":cronet_package_copy_native_lib_unstripped",
     ":generate_javadoc",
     ":generate_licenses",
     ":jar_cronet_api_source",
     ":jar_cronet_other_source",
     ":jar_cronet_sample_source",
     ":repackage_extracted_jars",
   ]
 }