diff options
| author |  laurentlb <laurentlb@google.com> | 2017-06-30 00:32:04 +0200 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-06-30 13:00:58 +0200 |
| commit | 3d2a68c6da2a50a9e1bcf6615e83a43701cdf95d (patch) | |
| tree | 31692a985d316e33733ab6993e529b8a08c206b6 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java | |
| parent | 2d5eeab381713f99c8c8b7b80f3d447be847b548 (diff) | |
Automated conversion to Java 8
With a few manual fixes for readability.
RELNOTES: None.
PiperOrigin-RevId: 160582556
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java index ee77eaa6df..f8169a1500 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java @@ -13,7 +13,6 @@ // limitations under the License. package com.google.devtools.build.lib.rules.android; -import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -28,7 +27,6 @@ import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; /** * Builder for creating $android_resource_validator action. This action validates merged resources @@ -57,13 +55,6 @@ class AndroidResourceValidatorActionBuilder { private ResourceDependencies resourceDeps; private Artifact aapt2SourceJarOut; private Artifact aapt2RTxtOut; - private static final Function<ResourceContainer, Artifact> TO_STATIC_LIBRARY_ARTIFACT = - new Function<ResourceContainer, Artifact>() { - @Override - public Artifact apply(@Nullable ResourceContainer resourceContainer) { - return resourceContainer.getStaticLibrary(); - } - }; private Artifact compiledSymbols; /** @param ruleContext The RuleContext that was used to create the SpawnAction.Builder. */ @@ -161,7 +152,8 @@ class AndroidResourceValidatorActionBuilder { builder.addExecPath("--aapt2", sdk.getAapt2().getExecutable()); FluentIterable<Artifact> libraries = - FluentIterable.from(resourceDeps.getResources()).transform(TO_STATIC_LIBRARY_ARTIFACT); + FluentIterable.from(resourceDeps.getResources()) + .transform(ResourceContainer::getStaticLibrary); builder .add("--libraries") |