StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove obsolete java version environment variables" into main am: f2c51919ad

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814561

Change-Id: I841987073791226e2daf55a11b41f32d98cdcbd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-11-02 17:47:30 +00:00
committed by Automerger Merge Worker
parent 3028fabfd6 f2c51919ad
commit d72155f0ed
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/config/makevars.go
View File

@@ -34,8 +34,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("ANDROID_JAVA_HOME", "${JavaHome}")
ctx.Strict("ANDROID_JAVA8_HOME", "prebuilts/jdk/jdk8/${hostPrebuiltTag}")
ctx.Strict("ANDROID_JAVA9_HOME", "prebuilts/jdk/jdk9/${hostPrebuiltTag}")
ctx.Strict("ANDROID_JAVA11_HOME", "prebuilts/jdk/jdk11/${hostPrebuiltTag}")
ctx.Strict("ANDROID_JAVA_TOOLCHAIN", "${JavaToolchain}")
ctx.Strict("JAVA", "${JavaCmd} ${JavaVmFlags}")
ctx.Strict("JAVAC", "${JavacCmd} ${JavacVmFlags}")