Allow named outputs in Android Keystore

Summary: This gives the ability to access each of the saved paths in the `Keystore` without needing to resort to flavors. This is better because it is consistent with the way that we want Buck V2 to work.

Reviewed By: mykola-semko

fbshipit-source-id: 4befae359413d96dab8c71e3c557568a9693f5e2

Author: IanChilds

src/com/facebook/buck/jvm/java/Keystore.java

@@ -19,16 +19,23 @@
 import com.facebook.buck.core.build.buildable.context.BuildableContext;
 import com.facebook.buck.core.build.context.BuildContext;
 import com.facebook.buck.core.model.BuildTarget;
+import com.facebook.buck.core.model.OutputLabel;
 import com.facebook.buck.core.rulekey.AddToRuleKey;
 import com.facebook.buck.core.rules.BuildRuleParams;
+import com.facebook.buck.core.rules.attr.HasMultipleOutputs;
 import com.facebook.buck.core.rules.impl.AbstractBuildRuleWithDeclaredAndExtraDeps;
 import com.facebook.buck.core.sourcepath.SourcePath;
 import com.facebook.buck.io.filesystem.ProjectFilesystem;
 import com.facebook.buck.step.Step;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
 import javax.annotation.Nullable;
 
-public class Keystore extends AbstractBuildRuleWithDeclaredAndExtraDeps {
+public class Keystore extends AbstractBuildRuleWithDeclaredAndExtraDeps
+    implements HasMultipleOutputs {
+  private static final OutputLabel KEYSTORE_LABEL = OutputLabel.of("keystore");
+  private static final OutputLabel PROPERTIES_LABEL = OutputLabel.of("properties");
 
   @AddToRuleKey private final SourcePath pathToStore;
   @AddToRuleKey private final SourcePath pathToProperties;
@@ -44,12 +51,29 @@ public Keystore(
     this.pathToProperties = properties;
   }
 
+  @Override
+  public ImmutableSet<OutputLabel> getOutputLabels() {
+    return ImmutableSet.of(KEYSTORE_LABEL, PROPERTIES_LABEL);
+  }
+
   @Nullable
   @Override
   public SourcePath getSourcePathToOutput() {
     return null;
   }
 
+  @Nullable
+  @Override
+  public ImmutableSortedSet<SourcePath> getSourcePathToOutput(OutputLabel outputLabel) {
+    if (outputLabel.equals(KEYSTORE_LABEL)) {
+      return ImmutableSortedSet.of(pathToStore);
+    } else if (outputLabel.equals(PROPERTIES_LABEL)) {
+      return ImmutableSortedSet.of(pathToProperties);
+    } else {
+      return ImmutableSortedSet.of();
+    }
+  }
+
   public SourcePath getPathToStore() {
     return pathToStore;
   }

test/com/facebook/buck/android/AndroidKeystoreIntegrationTest.java

@@ -41,16 +41,34 @@ public void setUp() throws IOException {
   }
 
   @Test
-  public void testKeystoreOutput() throws IOException {
-    Path output = workspace.buildAndReturnOutput("//keystores:copy_keystore");
+  public void testKeystoreOutputUsingFlavor() throws IOException {
+    Path output = workspace.buildAndReturnOutput("//keystores:copy_keystore_using_flavor");
     String copyOutput = workspace.getFileContents(output);
     String source = workspace.getFileContents("keystores/debug.keystore");
     assertEquals(source, copyOutput);
   }
 
   @Test
-  public void testKeystorePropertiesOutput() throws IOException {
-    Path output = workspace.buildAndReturnOutput("//keystores:copy_keystore_properties");
+  public void testKeystorePropertiesOutputUsingFlavor() throws IOException {
+    Path output =
+        workspace.buildAndReturnOutput("//keystores:copy_keystore_properties_using_flavor");
+    String copyOutput = workspace.getFileContents(output);
+    String source = workspace.getFileContents("keystores/debug.keystore.properties");
+    assertEquals(source, copyOutput);
+  }
+
+  @Test
+  public void testKeystoreOutputUsingNamedOutput() throws IOException {
+    Path output = workspace.buildAndReturnOutput("//keystores:copy_keystore_using_named_output");
+    String copyOutput = workspace.getFileContents(output);
+    String source = workspace.getFileContents("keystores/debug.keystore");
+    assertEquals(source, copyOutput);
+  }
+
+  @Test
+  public void testKeystorePropertiesOutputUsingNamedOutput() throws IOException {
+    Path output =
+        workspace.buildAndReturnOutput("//keystores:copy_keystore_properties_using_named_output");
     String copyOutput = workspace.getFileContents(output);
     String source = workspace.getFileContents("keystores/debug.keystore.properties");
     assertEquals(source, copyOutput);

test/com/facebook/buck/android/testdata/android_project/keystores/BUCK.fixture

@@ -6,12 +6,23 @@ keystore(
 )
 
 genrule(
-    name = "copy_keystore",
+    name = "copy_keystore_using_flavor",
     out = "copy.keystore",
     cmd = "cp $(location :debug#keystore) $OUT",
 )
 genrule(
-    name = "copy_keystore_properties",
+    name = "copy_keystore_properties_using_flavor",
     out = "copy.properties",
     cmd = "cp $(location :debug#properties) $OUT",
 )
+
+genrule(
+    name = "copy_keystore_using_named_output",
+    out = "copy.keystore",
+    cmd = "cp $(location :debug[keystore]) $OUT",
+)
+genrule(
+    name = "copy_keystore_properties_using_named_output",
+    out = "copy.properties",
+    cmd = "cp $(location :debug[properties]) $OUT",
+)