Enable 'latest' in run-d8-on-gmscore, also fix missing main-dex-list...
...in gmscore_data.py
Bug:
Change-Id: Id1dab4de81f0c7f7b8c747209f81abcfae9c251b
diff --git a/tools/gmscore_data.py b/tools/gmscore_data.py
index c8c81a3..80e7853 100644
--- a/tools/gmscore_data.py
+++ b/tools/gmscore_data.py
@@ -125,6 +125,7 @@
},
'proguarded' : {
'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-d8-on-gmscore.py b/tools/run-d8-on-gmscore.py
index 342f61e..63865d0 100755
--- a/tools/run-d8-on-gmscore.py
+++ b/tools/run-d8-on-gmscore.py
@@ -25,7 +25,7 @@
result.add_option('--version',
help = '',
default = 'v9',
- choices = ['v9', 'v10'])
+ choices = ['v9', 'v10', 'latest'])
result.add_option('--type',
help = '',
default = 'proguarded',
