Add support for running with different jdks in compiledump
Change-Id: I351892ed3835e6cdbcf11c2337f4690feab29144
diff --git a/tools/compiledump.py b/tools/compiledump.py
index 684be7f..4381eba 100755
--- a/tools/compiledump.py
+++ b/tools/compiledump.py
@@ -42,6 +42,9 @@
'--compiler',
help='Compiler to use',
default=None)
+ parser.add_argument('--jdk',
+ help='JDK to use',
+ choices=jdk.ALL_JDKS)
parser.add_argument('--minify',
help='Force enable/disable minification'
' (defaults to app proguard config)',
@@ -853,6 +856,7 @@
def run(args, otherargs):
gradle.EnsureJdk()
+ jdkhome = jdk.GetJdkRoot(args.jdk) if args.jdk else None
if args.summary:
summarize_dump_files(otherargs)
elif args.loop:
@@ -862,10 +866,10 @@
out = args.temp
if out:
out = os.path.join(out, '{:03d}'.format(count))
- run1(out, args, otherargs)
+ run1(out, args, otherargs, jdkhome=jdkhome)
count += 1
else:
- run1(args.temp, args, otherargs)
+ run1(args.temp, args, otherargs, jdkhome=jdkhome)
if __name__ == '__main__':
diff --git a/tools/jdk.py b/tools/jdk.py
index 86f2c3a..3c2d3ec 100755
--- a/tools/jdk.py
+++ b/tools/jdk.py
@@ -17,14 +17,14 @@
return GetJdk11Home()
-def GetJdkRoot():
- return GetJdk11Root()
+def GetJdkRoot(name):
+ root = os.path.join(JDK_DIR, name)
+ os_root = GetOSPath(root)
+ return os_root if os_root else os.environ['JAVA_HOME']
def GetJdk11Root():
- root = os.path.join(JDK_DIR, 'jdk-11')
- os_root = GetOSPath(root)
- return os_root if os_root else os.environ['JAVA_HOME']
+ return GetJdkRoot('jdk-11')
def GetOSPath(root):
