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

Use Java 1.8 when generating build files am: 78885cae81

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

Change-Id: Ic9734a022545354354f15ad775189598759b87f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sorin Basca
2024-01-26 19:20:42 +00:00
committed by Automerger Merge Worker
parent c8f2bfaca9 78885cae81
commit c7f2e1d6c7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/pom2bp/pom2bp.go
View File

@@ -651,7 +651,7 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(`
{{- end}} {{- end}}
], ],
{{- end}} {{- end}}
java_version: "1.7", java_version: "1.8",
} }
`)) `))

2
cmd/pom2mk/pom2mk.go
View File

@@ -262,7 +262,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES :={{if .IsAar}} \
{{.MkName}}-nodeps{{end}}{{range .MkAarDeps}} \ {{.MkName}}-nodeps{{end}}{{range .MkAarDeps}} \
{{.}}{{end}} {{.}}{{end}}
LOCAL_JAR_EXCLUDE_FILES := none LOCAL_JAR_EXCLUDE_FILES := none
LOCAL_JAVA_LANGUAGE_VERSION := 1.7 LOCAL_JAVA_LANGUAGE_VERSION := 1.8
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)
`)) `))