@@ -20,12 +20,12 @@ load("//java/common:java_semantics.bzl", "semantics")
2020load ("//java/common/rules/impl:java_helper.bzl" , "helper" )
2121load ("//java/private:boot_class_path_info.bzl" , "BootClassPathInfo" )
2222load ("//java/private:java_info.bzl" , "JavaPluginDataInfo" )
23+ load ("//java/private:native.bzl" , "get_internal_java_common" )
2324load (":java_package_configuration.bzl" , "JavaPackageConfigurationInfo" )
2425load (":java_runtime.bzl" , "JavaRuntimeInfo" )
2526
2627# copybara: default visibility
2728
28- _java_common_internal = java_common .internal_DO_NOT_USE ()
2929ToolchainInfo = platform_common .ToolchainInfo
3030
3131def _java_toolchain_info_init (** _kwargs ):
@@ -99,7 +99,7 @@ def _java_toolchain_impl(ctx):
9999 ijar = ctx .attr .ijar .files_to_run if ctx .attr .ijar else None ,
100100 jacocorunner = ctx .attr .jacocorunner .files_to_run if ctx .attr .jacocorunner else None ,
101101 java_runtime = java_runtime ,
102- jvm_opt = depset (_java_common_internal .expand_java_opts (ctx , "jvm_opts" , tokenize = False , exec_paths = True )),
102+ jvm_opt = depset (get_internal_java_common () .expand_java_opts (ctx , "jvm_opts" , tokenize = False , exec_paths = True )),
103103 label = ctx .label ,
104104 proguard_allowlister = ctx .attr .proguard_allowlister .files_to_run if ctx .attr .proguard_allowlister else None ,
105105 single_jar = ctx .attr .singlejar .files_to_run ,
@@ -164,8 +164,8 @@ def _get_javac_opts(ctx):
164164 opts .extend (["-target" , ctx .attr .target_version ])
165165 if ctx .attr .xlint :
166166 opts .append ("-Xlint:" + "," .join (ctx .attr .xlint ))
167- opts .extend (_java_common_internal .expand_java_opts (ctx , "misc" , tokenize = True ))
168- opts .extend (_java_common_internal .expand_java_opts (ctx , "javacopts" , tokenize = True ))
167+ opts .extend (get_internal_java_common () .expand_java_opts (ctx , "misc" , tokenize = True ))
168+ opts .extend (get_internal_java_common () .expand_java_opts (ctx , "javacopts" , tokenize = True ))
169169 return opts
170170
171171def _get_android_lint_tool (ctx ):
0 commit comments