diff options
| author |  cparsons <cparsons@google.com> | 2018-03-27 14:17:44 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-27 14:19:17 -0700 |
| commit | af1fb45d2273830f6efca2fbaf61fce0d8744bf5 (patch) | |
| tree | 59cd1d21a5f4328bedf730f21196f4cee8191e0d /src/main/java/com/google/devtools/build/lib/analysis/skylark | |
| parent | 2b14d358efd0fd6470df8c311e7b8e8836132b1e (diff) | |
Expose j2objc.dead_code_report as a configuration field instead of a basic struct field on the j2objc fragment.
RELNOTES: None.
PiperOrigin-RevId: 190672475
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/skylark')
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkLateBoundDefault.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkLateBoundDefault.java index 2b22fe83e6..52d316259e 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkLateBoundDefault.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkLateBoundDefault.java @@ -71,6 +71,9 @@ public class SkylarkLateBoundDefault<FragmentT> extends AbstractLabelLateBoundDe */ private static Label getDefaultLabel( SkylarkConfigurationField annotation, String toolsRepository) { + if (annotation.defaultLabel().isEmpty()) { + return null; + } Label defaultLabel = annotation.defaultInToolRepository() ? Label.parseAbsoluteUnchecked(toolsRepository + annotation.defaultLabel()) : Label.parseAbsoluteUnchecked(annotation.defaultLabel()); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations/SkylarkConfigurationField.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations/SkylarkConfigurationField.java index 887cedae4e..6e72e317b8 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations/SkylarkConfigurationField.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations/SkylarkConfigurationField.java @@ -47,7 +47,7 @@ public @interface SkylarkConfigurationField { * <p>If the default label is under the tools repository, omit the tools repository prefix * from this default, but set {@link #defaultInToolRepository} to true.</p> */ - String defaultLabel(); + String defaultLabel() default ""; /** * Whether the default label as defined in {@link #defaultLabel} should be prefixed with |