commit ec896b6c4d9cb585ce1ae3c562043d56fbe0fb17
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Sep 28 11:33:10 2018 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Sep 28 11:33:10 2018 +0200
tree 005eb676959549823730074fe375f30da7e299f3
parent 86b9d825ca2a2efd227c145e06deaf327be11523

Ignore annotations for non-existent parameters

Bug: 116089492
Change-Id: I61b0cdc66172e7d50016012a2b75ab62f2030ac1

tools/youtube_data.py

diff --git a/tools/youtube_data.py b/tools/youtube_data.py
index 6fdf63a..2e3be27 100644
--- a/tools/youtube_data.py
+++ b/tools/youtube_data.py
@@ -39,12 +39,15 @@
       'pgconf': ['%s_proguard.config' % V12_10_PREFIX,
                  '%s/proguardsettings/YouTubeRelease_proguard.config' % THIRD_PARTY],
       'min-api' : ANDROID_L_API,
-    },
-    'proguarded' : {
-      'inputs': ['%s_proguard.jar' % V12_10_PREFIX],
-      'pgmap': '%s_proguard.map' % V12_10_PREFIX,
-      'min-api' : ANDROID_L_API,
     }
+    # The 'proguarded' version cannot be handled by D8/R8 because there are
+    # parameter annotations for parameters that do not exist, which is not
+    # handled gracefully by ASM (see b/116089492).
+    #'proguarded' : {
+    #  'inputs': ['%s_proguard.jar' % V12_10_PREFIX],
+    #  'pgmap': '%s_proguard.map' % V12_10_PREFIX,
+    #  'min-api' : ANDROID_L_API,
+    #}
   },
   '12.17': {
     'dex' : {