Merge "Update how gmscore tests are run"
diff --git a/tools/gmscore_data.py b/tools/gmscore_data.py
index 8ff59df..e6d7677 100644
--- a/tools/gmscore_data.py
+++ b/tools/gmscore_data.py
@@ -72,10 +72,10 @@
},
'v9': {
'dex' : {
+ 'flags': '--no-desugaring',
'inputs': [os.path.join(V9_BASE, 'armv7_GmsCore_prod_alldpi_release.apk')],
+ 'main-dex-list': os.path.join(V9_BASE, 'main_dex_list.txt'),
'pgmap': '%s_proguard.map' % V9_PREFIX,
- 'libraries' : [ANDROID_JAR],
- 'min-api' : ANDROID_L_API,
},
'deploy' : {
'pgconf': ['%s_proguard.config' % V9_PREFIX],
@@ -83,18 +83,18 @@
'min-api' : ANDROID_L_API,
},
'proguarded' : {
+ 'flags': '--no-desugaring',
'inputs': ['%s_proguard.jar' % V9_PREFIX],
'main-dex-list': os.path.join(V9_BASE, 'main_dex_list.txt'),
'pgmap': '%s_proguard.map' % V9_PREFIX,
- 'min-api' : ANDROID_L_API,
}
},
'v10': {
'dex' : {
+ 'flags': '--no-desugaring',
'inputs': [os.path.join(V10_BASE, 'armv7_GmsCore_prod_alldpi_release.apk')],
+ 'main-dex-list': os.path.join(V10_BASE, 'main_dex_list.txt') ,
'pgmap': '%s_proguard.map' % V10_PREFIX,
- 'libraries' : [ANDROID_JAR],
- 'min-api' : ANDROID_L_API,
},
'deploy' : {
'inputs': ['%s_deploy.jar' % V10_PREFIX],
@@ -102,10 +102,10 @@
'min-api' : ANDROID_L_API,
},
'proguarded' : {
+ 'flags': '--no-desugaring',
'inputs': ['%s_proguard.jar' % V10_PREFIX],
'main-dex-list': os.path.join(V10_BASE, 'main_dex_list.txt') ,
'pgmap': '%s_proguard.map' % V10_PREFIX,
- 'min-api' : ANDROID_L_API,
}
},
'latest': {
@@ -117,10 +117,10 @@
'min-api' : ANDROID_L_API,
},
'proguarded' : {
+ 'flags': '--no-desugaring',
'inputs': ['%s_proguard.jar' % LATEST_PREFIX],
'main-dex-list': os.path.join(LATEST_BASE, 'main_dex_list.txt') ,
'pgmap': '%s_proguard.map' % LATEST_PREFIX,
- 'min-api' : ANDROID_L_API,
}
},
}
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index bab9b32..f2cd0e0 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -217,6 +217,9 @@
if 'min-api' in values:
args.extend(['--min-api', values['min-api']])
+ if 'main-dex-list' in values:
+ args.extend(['--main-dex-list', values['main-dex-list']])
+
if options.compiler == 'r8':
if 'pgconf' in values and not options.k:
for pgconf in values['pgconf']:
@@ -236,10 +239,14 @@
and not os.path.exists(outdir):
os.makedirs(outdir)
+ # Additional flags for the compiler from the configuration file.
+ if 'flags' in values:
+ args.extend(values['flags'].split(' '))
if options.compiler == 'r8':
if 'r8-flags' in values:
args.extend(values['r8-flags'].split(' '))
+ # Additional flags for the compiler from the command line.
if options.compiler_flags:
args.extend(options.compiler_flags.split(' '))
if options.r8_flags:
