diff options
| author | svidyuk <svidyuk@yandex-team.com> | 2024-11-11 06:34:10 +0300 |
|---|---|---|
| committer | svidyuk <svidyuk@yandex-team.com> | 2024-11-11 06:48:20 +0300 |
| commit | 0c30aa1174f1b6b193bac7b5c67f32d039e872e5 (patch) | |
| tree | 2207ef467e8143cbe99e664a12cf7f546b36cde5 | |
| parent | e11ca1574a69c727ca6cac2c1bd9300993733490 (diff) | |
| download | ydb-0c30aa1174f1b6b193bac7b5c67f32d039e872e5.tar.gz | |
Stop calculating data for some dead jbuild code paths
commit_hash:88de11271aee6ce875a836cbfb24e825d8e7fa99
| -rw-r--r-- | build/conf/java.conf | 3 | ||||
| -rw-r--r-- | build/plugins/java.py | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 6644544717..39fd1835d4 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -1747,15 +1747,12 @@ when ($SAVE_JAVAC_GENERATED_SRCS) { } # tag:java-specific -# TODO: MAVEN_GROUP_ID_VALUE is only used by jbuild remove it after YMAKE-45 and YMAKE-46 -MAVEN_GROUP_ID_VALUE= MAVEN_EXPORT_GROUP_ID=ru.yandex ### @usage: MAVEN_GROUP_ID(group_id_for_maven_export) ### ### Set maven export group id for JAVA_PROGRAM() and JAVA_LIBRARY(). ### Have no effect on regular build. macro MAVEN_GROUP_ID(Arg, VERSION="no") { - SET(MAVEN_GROUP_ID_VALUE $Arg) SET(MAVEN_EXPORT_GROUP_ID $Arg) SET(PUBLISH_MAVEN_VERSION $VERSION) } diff --git a/build/plugins/java.py b/build/plugins/java.py index 352030afb9..1b7fe247c8 100644 --- a/build/plugins/java.py +++ b/build/plugins/java.py @@ -72,8 +72,8 @@ def onjava_module(unit, *args): 'JAVA_SRCS': extract_macro_calls(unit, 'JAVA_SRCS_VALUE', args_delim), 'JAVAC_FLAGS': extract_macro_calls(unit, 'JAVAC_FLAGS_VALUE', args_delim), 'ANNOTATION_PROCESSOR': extract_macro_calls(unit, 'ANNOTATION_PROCESSOR_VALUE', args_delim), - 'EXTERNAL_JAR': extract_macro_calls(unit, 'EXTERNAL_JAR_VALUE', args_delim), - 'MAVEN_GROUP_ID': extract_macro_calls(unit, 'MAVEN_GROUP_ID_VALUE', args_delim), + 'EXTERNAL_JAR': [], + 'MAVEN_GROUP_ID': [], 'JAR_INCLUDE_FILTER': extract_macro_calls(unit, 'JAR_INCLUDE_FILTER_VALUE', args_delim), 'JAR_EXCLUDE_FILTER': extract_macro_calls(unit, 'JAR_EXCLUDE_FILTER_VALUE', args_delim), # TODO remove when java test dart is in prod |