[Cronet] Adjust to Android M permissions model

components/cronet.gypi

Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index 228057b4af71def3d0659e7b4975639708cfb420..12efd2c5d3aebea9e89638e47437b013698cb502 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -232,7 +232,15 @@
             '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',
@@ -251,7 +259,15 @@
             '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',
@@ -287,6 +303,7 @@
           'dependencies': [
             'cronet_java',
             'cronet_api',
+            '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
           ],
           'variables': {
             'apk_name': 'CronetSample',