commit 9bee2d85c4ce21382f430f6eafa102f0f3e510f9
author Lars Bak <bak@google.com> Wed Aug 23 11:00:04 2017 +0200
committer Lars Bak <bak@google.com> Wed Aug 23 11:00:04 2017 +0200
tree 304862200e188dffdfa8a9242de8c085c1440ed2
parent 887d57fa6a13370d1fd925efceb32ac1b235f769

Added main-dex-list to tools/run-d8-on-gmscore.py.

Bug:
Change-Id: I7408f1dbd9ade74ec9ac7974d95066f9396e5628

tools/gmscore_data.py

diff --git a/tools/gmscore_data.py b/tools/gmscore_data.py
index 47d9024..e77ea18 100644
--- a/tools/gmscore_data.py
+++ b/tools/gmscore_data.py
@@ -90,6 +90,7 @@
     },
     'proguarded' : {
       '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,
      }
@@ -109,6 +110,7 @@
     },
     'proguarded' : {
       '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,
     }

tools/run-d8-on-gmscore.py

diff --git a/tools/run-d8-on-gmscore.py b/tools/run-d8-on-gmscore.py
index e150278..342f61e 100755
--- a/tools/run-d8-on-gmscore.py
+++ b/tools/run-d8-on-gmscore.py
@@ -58,6 +58,9 @@
   if not os.path.exists(outdir):
     os.makedirs(outdir)
 
+  if 'main-dex-list' in values:
+    args.extend(['--main-dex-list', values['main-dex-list']])
+
   if options.d8_flags:
     args.extend(options.d8_flags.split(' '))