From 78885cae81eb54053953fbcfb9af8c1715265e06 Mon Sep 17 00:00:00 2001
From: Sorin Basca <sorinbasca@google.com>
Date: Fri, 26 Jan 2024 16:47:40 +0000
Subject: [PATCH] Use Java 1.8 when generating build files

Bug: 320294595
Test: m
Change-Id: I5d4405001e02f2baa56650203be23caceb1094c0
---
 cmd/pom2bp/pom2bp.go | 2 +-
 cmd/pom2mk/pom2mk.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/pom2bp/pom2bp.go b/cmd/pom2bp/pom2bp.go
index 3fb445480..6d1caf978 100644
--- a/cmd/pom2bp/pom2bp.go
+++ b/cmd/pom2bp/pom2bp.go
@@ -651,7 +651,7 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(`
         {{- end}}
     ],
     {{- end}}
-    java_version: "1.7",
+    java_version: "1.8",
 }
 `))
 
diff --git a/cmd/pom2mk/pom2mk.go b/cmd/pom2mk/pom2mk.go
index b3471556a..5ca770eca 100644
--- a/cmd/pom2mk/pom2mk.go
+++ b/cmd/pom2mk/pom2mk.go
@@ -262,7 +262,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES :={{if .IsAar}} \
   {{.MkName}}-nodeps{{end}}{{range .MkAarDeps}}  \
   {{.}}{{end}}
 LOCAL_JAR_EXCLUDE_FILES := none
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
+LOCAL_JAVA_LANGUAGE_VERSION := 1.8
 LOCAL_USE_AAPT2 := true
 include $(BUILD_STATIC_JAVA_LIBRARY)
 `))