commit 9cf6a7483bf8026b89ee35b6d594f77518a9bc69
author Mathias Rav <mathiasr@google.com> Tue May 22 09:34:45 2018 +0200
committer Mathias Rav <mathiasr@google.com> Tue May 22 09:34:45 2018 +0200
tree ce038659782356ba370ee1d3856c0a4995c48ee1
parent 7ab97d1ecf66e52bd2477523756e5f79f14f9ccb

utils.py: Run dexsegments via the swiss army knife

After introducing the SwissArmyKnife entrypoint, dexsegments.jar is no
longer built by gradle.

Fixes I75270518 dd6a6de7d ("Tools: Switch from JAR-per-tool to a single
swiss army knife", 2018-05-18).

Bug: 80077148
Change-Id: I84c49a2f4d75754181a0c228f35a02d587b5ddb8

tools/utils.py

diff --git a/tools/utils.py b/tools/utils.py
index 3b80a88..9f6959f 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -15,8 +15,6 @@
 TOOLS_DIR = os.path.abspath(os.path.normpath(os.path.join(__file__, '..')))
 REPO_ROOT = os.path.realpath(os.path.join(TOOLS_DIR, '..'))
 MEMORY_USE_TMP_FILE = 'memory_use.tmp'
-DEX_SEGMENTS_JAR = os.path.join(REPO_ROOT, 'build', 'libs',
-    'dexsegments.jar')
 DEX_SEGMENTS_RESULT_PATTERN = re.compile('- ([^:]+): ([0-9]+)')
 BUILD = os.path.join(REPO_ROOT, 'build')
 LIBS = os.path.join(BUILD, 'libs')
@@ -189,7 +187,7 @@
 # Return a dictionary: {segment_name -> segments_size}
 def getDexSegmentSizes(dex_files):
   assert len(dex_files) > 0
-  cmd = ['java', '-jar', DEX_SEGMENTS_JAR]
+  cmd = ['java', '-jar', R8_JAR, 'dexsegments']
   cmd.extend(dex_files)
   PrintCmd(cmd)
   output = subprocess.check_output(cmd)