diff options
author | Yifei Zhang <yfz@google.com> | 2023-07-25 07:50:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-25 07:50:08 +0000 |
commit | f7d94438c8bcdfdbf0d5a2a5e40120d0696e7088 (patch) | |
tree | 405bdc36825a61db2a15f10b8775c78010ee0b56 /javatests/com/google/turbine/lower/IntegrationTestSupport.java | |
parent | d4be1f10b831f4c3774091c74e4b904ec6450c9a (diff) | |
parent | ea1cf67d10bfde29a1bb50ba92fd4d3137916e41 (diff) | |
download | turbine-f7d94438c8bcdfdbf0d5a2a5e40120d0696e7088.tar.gz |
Upgrade turbine to 7c64f0447a967d4717adb7b1b40d8bb856f34186 am: 6f7cfa29c3 am: 278edfeffb am: 5ff202242e am: 820217dbd2 am: ea1cf67d10HEADandroid-14.0.0_r51android-14.0.0_r50android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29mastermainandroid14-qpr3-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/2674341
Change-Id: I83c10ceb7d338fd1791d717b833e2c7d589f7704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'javatests/com/google/turbine/lower/IntegrationTestSupport.java')
-rw-r--r-- | javatests/com/google/turbine/lower/IntegrationTestSupport.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/javatests/com/google/turbine/lower/IntegrationTestSupport.java b/javatests/com/google/turbine/lower/IntegrationTestSupport.java index f20962b..6527a03 100644 --- a/javatests/com/google/turbine/lower/IntegrationTestSupport.java +++ b/javatests/com/google/turbine/lower/IntegrationTestSupport.java @@ -33,6 +33,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.MoreFiles; import com.google.common.jimfs.Configuration; import com.google.common.jimfs.Jimfs; +import org.objectweb.asm.Opcodes; import com.google.turbine.binder.Binder; import com.google.turbine.binder.Binder.BindingResult; import com.google.turbine.binder.ClassPath; @@ -496,7 +497,9 @@ public final class IntegrationTestSupport { throws IOException { BindingResult bound = turbineAnalysis(input, classpath, bootClassPath, moduleVersion); return Lower.lowerAll( - LanguageVersion.fromJavacopts(javacopts), + Lower.LowerOptions.builder() + .languageVersion(LanguageVersion.fromJavacopts(javacopts)) + .build(), bound.units(), bound.modules(), bound.classPathEnv()) |