commit 49e54a18aeacc5276eddb4d566e22e08ff0854ad
author Yohann Roussel <yroussel@google.com> Fri Jun 23 18:08:07 2017 +0200
committer Yohann Roussel <yroussel@google.com> Fri Jun 23 18:08:07 2017 +0200
tree 1826b6ea95cd9bb6aa0d92d7af28c454756cc829
parent 023b2ee05765c25c9e84a85bcb91b9915ae86b96

Fix run_on_app.py for gmscore and Youtube

GMSCore and Youtube don't fit in one dex and no multidex rule/list is given, so
a min sdk compatible with native multidex is required.

Change-Id: Ibb894b871d918d65bf01f54b05133252c2646a6a

tools/youtube_data.py

diff --git a/tools/youtube_data.py b/tools/youtube_data.py
index b32a372..5ec6bee 100644
--- a/tools/youtube_data.py
+++ b/tools/youtube_data.py
@@ -7,6 +7,7 @@
 import utils
 
 THIRD_PARTY = os.path.join(utils.REPO_ROOT, 'third_party')
+ANDROID_L_API = '21'
 BASE = os.path.join(THIRD_PARTY, 'youtube')
 
 V12_10_BASE = os.path.join(BASE, 'youtube.android_12.10')
@@ -29,15 +30,18 @@
       'pgmap': '%s_proguard.map' % V12_10_PREFIX,
       'libraries' : [ANDROID_JAR],
       'r8-flags': '--ignore-missing-classes',
+      'min-sdk-version' : ANDROID_L_API,
     },
     'deploy' : {
       'inputs': ['%s_deploy.jar' % V12_10_PREFIX],
       'pgconf': ['%s_proguard.config' % V12_10_PREFIX,
                  '%s/proguardsettings/YouTubeRelease_proguard.config' % THIRD_PARTY],
+      'min-sdk-version' : ANDROID_L_API,
     },
     'proguarded' : {
       'inputs': ['%s_proguard.jar' % V12_10_PREFIX],
-      'pgmap': '%s_proguard.map' % V12_10_PREFIX
+      'pgmap': '%s_proguard.map' % V12_10_PREFIX,
+      'min-sdk-version' : ANDROID_L_API,
     }
   },
   '12.17': {
@@ -46,15 +50,18 @@
       'pgmap': '%s_proguard.map' % V12_17_PREFIX,
       'libraries' : [ANDROID_JAR],
       'r8-flags': '--ignore-missing-classes',
+      'min-sdk-version' : ANDROID_L_API,
     },
     'deploy' : {
       'inputs': ['%s_deploy.jar' % V12_17_PREFIX],
       'pgconf': ['%s_proguard.config' % V12_17_PREFIX,
                  '%s/proguardsettings/YouTubeRelease_proguard.config' % THIRD_PARTY],
+      'min-sdk-version' : ANDROID_L_API,
     },
     'proguarded' : {
       'inputs': ['%s_proguard.jar' % V12_17_PREFIX],
-      'pgmap': '%s_proguard.map' % V12_17_PREFIX
+      'pgmap': '%s_proguard.map' % V12_17_PREFIX,
+      'min-sdk-version' : ANDROID_L_API,
     }
   },
   '12.22': {
@@ -63,6 +70,7 @@
       'pgmap': '%s_proguard.map' % V12_22_PREFIX,
       'libraries' : [ANDROID_JAR],
       'r8-flags': '--ignore-missing-classes',
+      'min-sdk-version' : ANDROID_L_API,
     },
     'deploy' : {
       'inputs': ['%s_deploy.jar' % V12_22_PREFIX],
@@ -73,10 +81,12 @@
           os.path.join(V12_22_BASE, 'mainDexClasses.rules'),
           os.path.join(V12_22_BASE, 'main-dex-classes-release.cfg'),
           os.path.join(V12_22_BASE, 'main_dex_YouTubeRelease_proguard.cfg')],
+      'min-sdk-version' : ANDROID_L_API,
     },
     'proguarded' : {
       'inputs': ['%s_proguard.jar' % V12_22_PREFIX],
-      'pgmap': '%s_proguard.map' % V12_22_PREFIX
+      'pgmap': '%s_proguard.map' % V12_22_PREFIX,
+      'min-sdk-version' : ANDROID_L_API,
     }
   },
 }