commit bb8d6f6cc7a66c2c03bb73d3e384dd13a4ad28e5
author Nicolas Geoffray <ngeoffray@google.com> Tue Sep 12 11:04:23 2023 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Wed Sep 13 08:15:04 2023 +0000
tree 48825380ab2b6b172d1e900ab6585df9e52ea201
parent 0116f150eea4fa770f8fa157c5b880e03452bd43

Handle record flag in object-refvisitor.

Test: 849-records
Bug: 297966050
Change-Id: I49063df4b2b61b8f01bc1b6fff2d16906d0ac39f

test/run_test_build.py

diff --git a/test/run_test_build.py b/test/run_test_build.py
index eb2de12..c5b76c2 100755
--- a/test/run_test_build.py
+++ b/test/run_test_build.py
@@ -72,7 +72,7 @@
     self.java_home = Path(os.environ.get("JAVA_HOME")).absolute()
     self.java_path = self.java_home / "bin/java"
     self.javac_path = self.java_home / "bin/javac"
-    self.javac_args = "-g -Xlint:-options -source 1.8 -target 1.8"
+    self.javac_args = "-g -Xlint:-options"
 
     # Helper functions to execute tools.
     self.d8 = functools.partial(self.run, args.d8.absolute())
@@ -215,6 +215,8 @@
       smali_args=[],
       use_smali=True,
       use_jasmin=True,
+      javac_source_arg="1.8",
+      javac_target_arg="1.8"
     ):
     javac_classpath = javac_classpath.copy()  # Do not modify default value.
 
@@ -280,7 +282,8 @@
       dst_dir.mkdir(exist_ok=True)
       args = self.javac_args.split(" ") + javac_args
       args += ["-implicit:none", "-encoding", "utf8", "-d", dst_dir]
-      if not self.jvm:
+      args += ["-source", javac_source_arg, "-target", javac_target_arg]
+      if not self.jvm and float(javac_target_arg) < 17.0:
         args += ["-bootclasspath", self.bootclasspath]
       if javac_classpath:
         args += ["-classpath", javac_classpath]