[Cronet] Adjust to Android M permissions model

components/cronet.gypi

 # Copyright 2014 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.
 
 {
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'cronet_jni_headers',
@@ skipping 214 matching lines @@
         { # cronet_api.jar defines Cronet API and provides implementation of
           # legacy api using HttpUrlConnection (not the Chromium stack).
           'target_name': 'cronet_api',
           'type': 'none',
           'dependencies': [
             'http_cache_type_java',
             'url_request_error_java',
             'cronet_version',
             'load_states_list',
             'network_quality_observations_java',
-            '../third_party/android_tools/android_tools.gyp: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_tools.gyp:android_support_v13_javalib',

[pauljensen, 2016/05/10 12:37:23]

FYI This does not appear to increase the size of cronet.jar or cronet_api.jar

[xunjieli, 2016/05/10 14:12:07]

Acknowledged.

           ],
           'variables': {
             'java_in_dir': 'cronet/android/api',
             'run_findbugs': 1,
           },
           'includes': [ '../build/java.gypi' ],
         },
         { # cronet.jar implements HttpUrlRequest interface using Chromium stack
           # in native libcronet.so library.
           'target_name': 'cronet_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
             'cronet_api',
             'chromium_url_request_java',
             'libcronet',
             'net_request_priority_java',
             'network_quality_observations_java',
-            '../third_party/android_tools/android_tools.gyp: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_tools.gyp:android_support_v13_javalib',
           ],
           'variables': {
             'java_in_dir': 'cronet/android/java',
             'javac_includes': [
               '**/ChromiumUrlRequest.java',
               '**/ChromiumUrlRequestContext.java',
               '**/ChromiumUrlRequestError.java',
               '**/ChromiumUrlRequestFactory.java',
               '**/ChromiumUrlRequestPriority.java',
               '**/CronetBidirectionalStream.java',
@@ skipping 15 matching lines @@
             'run_findbugs': 1,
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'cronet_sample_apk',
           'type': 'none',
           'dependencies': [
             'cronet_java',
             'cronet_api',
+            '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
           ],
           'variables': {
             'apk_name': 'CronetSample',
             'java_in_dir': 'cronet/android/sample',
             'resource_dir': 'cronet/android/sample/res',
             'native_lib_target': 'libcronet',
             'proguard_enabled': 'true',
             'proguard_flags_paths': [
               'cronet/android/proguard.cfg',
               'cronet/android/sample/javatests/proguard.cfg',
@@ skipping 586 matching lines @@
                   'cronet/ios/test/cronet_bidirectional_stream_test.mm',
                   'cronet/ios/test/cronet_test_runner.mm',
                 ],
               },
             ],
           },
       ],
     }],  # OS=="ios"
   ],
 }