diff options
| author | Colin Cross <ccross@android.com> | 2017-09-05 21:57:45 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-09-06 13:44:03 -0700 |
| commit | 6c51d80adbd0b04eef877122bb394bf67f445c5e (patch) | |
| tree | 60aed1f1df9a2837abc14bdf008352d1c38a81c0 /androidmk | |
| parent | 0a6e007e06764fbeb8064671275b340aee362d8f (diff) | |
| download | build_soong-6c51d80adbd0b04eef877122bb394bf67f445c5e.tar.gz build_soong-6c51d80adbd0b04eef877122bb394bf67f445c5e.tar.bz2 build_soong-6c51d80adbd0b04eef877122bb394bf67f445c5e.zip | |
Update java androidmk conversions
Java prebuilts are now java_import, and add support for java_version
properties.
Test: m -j checkbuild
Change-Id: Ieae59efb3370f1370f82fc3672facbbb98205c68
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index caf594af..db44ef7e 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -76,6 +76,7 @@ func init() { "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 @@ var prebuiltTypes = map[string]string{ "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{} |