More run-test build determinism tweaks (part 2)

Also fix couple issues in host and jvm builds.

Non-determinism smali and d8 itself is the only remaining issue.

Bug: 147814778
Test: test.py --host
Change-Id: Icd5722600d9addf7c8a325cdf4a839882da8c302

3 files changed, 3 insertions, 3 deletions

diff --git a/test/968-default-partial-compile-gen/util-src/generate_java.py b/test/968-default-partial-compile-gen/util-src/generate_java.py
index 35290efe1d..ce3c912e35 100755
--- a/test/968-default-partial-compile-gen/util-src/generate_java.py
+++ b/test/968-default-partial-compile-gen/util-src/generate_java.py
@@ -67,7 +67,7 @@ class Compiler:
     """
     args = args.split()
     files = list(map(str, files))
-    cmd = ['sh', '-a', '-e', '--', str(self.javac)] + args + files
+    cmd = ['sh', '-a', '-e', '--', str(self.javac)] + args + sorted(files)
     print("Running compile command: {}".format(cmd))
     subprocess.check_call(cmd)
     print("Compiled {} files".format(len(files)))
diff --git a/test/971-iface-super/util-src/generate_java.py b/test/971-iface-super/util-src/generate_java.py
index 99b0479c8f..c246e88acb 100755
--- a/test/971-iface-super/util-src/generate_java.py
+++ b/test/971-iface-super/util-src/generate_java.py
@@ -67,7 +67,7 @@ class Compiler:
     """
     args = args.split()
     files = list(map(str, files))
-    cmd = ['sh', '-a', '-e', '--', str(self.javac)] + args + files
+    cmd = ['sh', '-a', '-e', '--', str(self.javac)] + args + sorted(files)
     print("Running compile command: {}".format(cmd))
     subprocess.check_call(cmd)
     print("Compiled {} files".format(len(files)))
diff --git a/test/etc/default-build b/test/etc/default-build
index 56cb918a94..244d75f32e 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -278,7 +278,7 @@ function javac_with_bootclasspath {
 # packaged in a jar file.
 function make_dex() {
   local name="$1"
-  local d8_inputs=$(find $name -name '*.class' -type f)
+  local d8_inputs=$(find $name -name '*.class' -type f | sort)
   local d8_output=${name}.jar
   local dex_output=${name}.dex
   local d8_local_flags=""