Skip to content

Commit 0c30aa1

Browse files
committed
Stop calculating data for some dead jbuild code paths
commit_hash:88de11271aee6ce875a836cbfb24e825d8e7fa99
1 parent e11ca15 commit 0c30aa1

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

build/conf/java.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,15 +1747,12 @@ when ($SAVE_JAVAC_GENERATED_SRCS) {
17471747
}
17481748

17491749
# tag:java-specific
1750-
# TODO: MAVEN_GROUP_ID_VALUE is only used by jbuild remove it after YMAKE-45 and YMAKE-46
1751-
MAVEN_GROUP_ID_VALUE=
17521750
MAVEN_EXPORT_GROUP_ID=ru.yandex
17531751
### @usage: MAVEN_GROUP_ID(group_id_for_maven_export)
17541752
###
17551753
### Set maven export group id for JAVA_PROGRAM() and JAVA_LIBRARY().
17561754
### Have no effect on regular build.
17571755
macro MAVEN_GROUP_ID(Arg, VERSION="no") {
1758-
SET(MAVEN_GROUP_ID_VALUE $Arg)
17591756
SET(MAVEN_EXPORT_GROUP_ID $Arg)
17601757
SET(PUBLISH_MAVEN_VERSION $VERSION)
17611758
}

build/plugins/java.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ def onjava_module(unit, *args):
7272
'JAVA_SRCS': extract_macro_calls(unit, 'JAVA_SRCS_VALUE', args_delim),
7373
'JAVAC_FLAGS': extract_macro_calls(unit, 'JAVAC_FLAGS_VALUE', args_delim),
7474
'ANNOTATION_PROCESSOR': extract_macro_calls(unit, 'ANNOTATION_PROCESSOR_VALUE', args_delim),
75-
'EXTERNAL_JAR': extract_macro_calls(unit, 'EXTERNAL_JAR_VALUE', args_delim),
76-
'MAVEN_GROUP_ID': extract_macro_calls(unit, 'MAVEN_GROUP_ID_VALUE', args_delim),
75+
'EXTERNAL_JAR': [],
76+
'MAVEN_GROUP_ID': [],
7777
'JAR_INCLUDE_FILTER': extract_macro_calls(unit, 'JAR_INCLUDE_FILTER_VALUE', args_delim),
7878
'JAR_EXCLUDE_FILTER': extract_macro_calls(unit, 'JAR_EXCLUDE_FILTER_VALUE', args_delim),
7979
# TODO remove when java test dart is in prod

0 commit comments

Comments
 (0)