diff options
| author |  Googler <noreply@google.com> | 2018-07-25 12:27:57 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-25 12:29:32 -0700 |
| commit | 55f41456d6f24d190668c74718141db20b0f5ab5 (patch) | |
| tree | 9b3c3b178e33b0d83b54935949b4e18bc7c93ce0 | |
| parent | beb5530f8c1717976736aaa30c2c8098bf34e845 (diff) | |
Expose the JavaConfiguration get fields to Skylark for the android_sdk rule.
RELNOTES: none.
PiperOrigin-RevId: 206035881
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/BUILD | 1 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java | 18 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index 6b27d1d86b..1c9d30a6bc 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -1072,6 +1072,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/actions:commandline_item", "//src/main/java/com/google/devtools/build/lib/analysis/platform", + "//src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/collect", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java index 29e93541f9..6bc1ed10d7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java @@ -22,6 +22,7 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment import com.google.devtools.build.lib.analysis.config.BuildConfiguration.StrictDepsMode; import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; +import com.google.devtools.build.lib.analysis.skylark.annotations.SkylarkConfigurationField; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; @@ -385,9 +386,11 @@ public final class JavaConfiguration extends Fragment implements JavaConfigurati return javaLauncherLabel; } - /** - * Returns the label provided with --proguard_top, if any. - */ + /** Returns the label provided with --proguard_top, if any. */ + @SkylarkConfigurationField( + name = "proguard_top", + doc = "Returns the label provided with --proguard_top, if any.", + defaultInToolRepository = true) @Nullable public Label getProguardBinary() { return proguardBinary; @@ -421,9 +424,12 @@ public final class JavaConfiguration extends Fragment implements JavaConfigurati return bundleTranslations == TriState.NO; } - /** - * Returns the label of the default java_toolchain rule - */ + /** Returns the label of the default java_toolchain rule */ + @SkylarkConfigurationField( + name = "java_toolchain", + doc = "Returns the label of the default java_toolchain rule.", + defaultLabel = "//tools/jdk:toolchain", + defaultInToolRepository = true) public Label getToolchainLabel() { return toolchainLabel; } |