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/gmscore_data.py

diff --git a/tools/gmscore_data.py b/tools/gmscore_data.py
index 4b9c430..9939e1c 100644
--- a/tools/gmscore_data.py
+++ b/tools/gmscore_data.py
@@ -20,6 +20,7 @@
 
 V10_BASE = os.path.join(BASE, 'gmscore_v10')
 V10_PREFIX = os.path.join(V10_BASE, 'GmsCore_prod_alldpi_release_all_locales')
+ANDROID_L_API = '21'
 
 # NOTE: we always use android.jar for SDK v25, later we might want to revise it
 #       to use proper android.jar version for each of gmscore version separately.
@@ -32,6 +33,7 @@
       'pgmap' : os.path.join(V4_BASE, 'proguard.map'),
       'libraries' : [ANDROID_JAR],
       'r8-flags': '--ignore-missing-classes',
+      'min-sdk-version' : ANDROID_L_API,
     }
   },
   'v5': {
@@ -40,6 +42,7 @@
       'pgmap' : os.path.join(V5_BASE, 'proguard.map'),
       'libraries' : [ANDROID_JAR],
       'r8-flags': '--ignore-missing-classes',
+      'min-sdk-version' : ANDROID_L_API,
     }
   },
   'v6': {
@@ -48,6 +51,7 @@
       'pgmap' : os.path.join(V6_BASE, 'proguard.map'),
       'libraries' : [ANDROID_JAR],
       'r8-flags': '--ignore-missing-classes',
+      'min-sdk-version' : ANDROID_L_API,
     }
   },
   'v7': {
@@ -56,6 +60,7 @@
       'pgmap' : os.path.join(V7_BASE, 'proguard.map'),
       'libraries' : [ANDROID_JAR],
       'r8-flags': '--ignore-missing-classes',
+      'min-sdk-version' : ANDROID_L_API,
     }
   },
   'v8': {
@@ -64,6 +69,7 @@
       'pgmap' : os.path.join(V8_BASE, 'proguard.map'),
       'libraries' : [ANDROID_JAR],
       'r8-flags': '--ignore-missing-classes',
+      'min-sdk-version' : ANDROID_L_API,
     }
   },
   'v9': {
@@ -72,15 +78,18 @@
       'pgmap': '%s_proguard.map' % V9_PREFIX,
       'libraries' : [ANDROID_JAR],
       'r8-flags': '--ignore-missing-classes',
+      'min-sdk-version' : ANDROID_L_API,
     },
     'deploy' : {
       'pgconf': ['%s_proguard.config' % V9_PREFIX],
-      'inputs': ['%s_deploy.jar' % V9_PREFIX]
+      'inputs': ['%s_deploy.jar' % V9_PREFIX],
+      'min-sdk-version' : ANDROID_L_API,
     },
     'proguarded' : {
       'inputs': ['%s_proguard.jar' % V9_PREFIX],
-      'pgmap': '%s_proguard.map' % V9_PREFIX
-    }
+      'pgmap': '%s_proguard.map' % V9_PREFIX,
+      'min-sdk-version' : ANDROID_L_API,
+     }
   },
   'v10': {
     'dex' : {
@@ -88,14 +97,17 @@
       'pgmap': '%s_proguard.map' % V10_PREFIX,
       'libraries' : [ANDROID_JAR],
       'r8-flags': '--ignore-missing-classes',
+      'min-sdk-version' : ANDROID_L_API,
     },
     'deploy' : {
       'inputs': ['%s_deploy.jar' % V10_PREFIX],
       'pgconf': ['%s_proguard.config' % V10_PREFIX],
+      'min-sdk-version' : ANDROID_L_API,
     },
     'proguarded' : {
       'inputs': ['%s_proguard.jar' % V10_PREFIX],
-      'pgmap': '%s_proguard.map' % V10_PREFIX
+      'pgmap': '%s_proguard.map' % V10_PREFIX,
+      'min-sdk-version' : ANDROID_L_API,
     }
   },
 }