diff options
| author | arcadia-devtools <[email protected]> | 2022-02-21 15:43:19 +0300 |
|---|---|---|
| committer | arcadia-devtools <[email protected]> | 2022-02-21 15:43:19 +0300 |
| commit | 178d0e7645de04588522cd6287777cd7a2f065f9 (patch) | |
| tree | 19adf240d2ef3b75bf3671aeeaa87eb15bfc0b21 /build/plugins/java.py | |
| parent | c161c2c45e7a70edd43d8fb8b4de942d62db5690 (diff) | |
intermediate changes
ref:489c487087adbbffdc59e875df6227bdb2f0bc23
Diffstat (limited to 'build/plugins/java.py')
| -rw-r--r-- | build/plugins/java.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/plugins/java.py b/build/plugins/java.py index 16fc1267348..5bff16027f1 100644 --- a/build/plugins/java.py +++ b/build/plugins/java.py @@ -124,9 +124,9 @@ def onjava_module(unit, *args): 'FAKEID': extract_macro_calls(unit, 'FAKEID', args_delim), 'TEST_DATA': extract_macro_calls(unit, 'TEST_DATA_VALUE', args_delim), 'JAVA_FORBIDDEN_LIBRARIES': extract_macro_calls(unit, 'JAVA_FORBIDDEN_LIBRARIES_VALUE', args_delim), - 'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or '_DEFAULT') + 'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT') } - if unit.get('ENABLE_PREVIEW_VALUE') == 'yes' and unit.get('JDK_VERSION') in ('15', '16', '17'): + if unit.get('ENABLE_PREVIEW_VALUE') == 'yes' and (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION')) in ('15', '16', '17'): data['ENABLE_PREVIEW'] = extract_macro_calls(unit, 'ENABLE_PREVIEW_VALUE', args_delim) if unit.get('SAVE_JAVAC_GENERATED_SRCS_DIR') and unit.get('SAVE_JAVAC_GENERATED_SRCS_TAR'): |