Update java androidmk conversions
Java prebuilts are now java_import, and add support for java_version
properties.
Test: m -j checkbuild
Change-Id: Ieae59efb3370f1370f82fc3672facbbb98205c68
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index caf594a..db44ef7 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -76,6 +76,7 @@
"LOCAL_MODULE_OWNER": "owner",
"LOCAL_RENDERSCRIPT_TARGET_API": "renderscript.target_api",
"LOCAL_NOTICE_FILE": "notice",
+ "LOCAL_JAVA_LANGUAGE_VERSION": "java_version",
})
addStandardProperties(bpparser.ListType,
map[string]string{
@@ -685,7 +686,7 @@
"SHARED_LIBRARIES": "cc_prebuilt_library_shared",
"STATIC_LIBRARIES": "cc_prebuilt_library_static",
"EXECUTABLES": "cc_prebuilt_binary",
- "JAVA_LIBRARIES": "prebuilt_java_library",
+ "JAVA_LIBRARIES": "java_import",
}
var soongModuleTypes = map[string]bool{}