Fail android_binary build with incorrect keystore alias.

Summary:Resolves #655
Closes #676

Reviewed By: sdwilsh

fb-gh-sync-id: db35a85
shipit-source-id: db35a85

src/com/facebook/buck/android/ApkBuilderStep.java

@@ -187,6 +187,15 @@ private PrivateKeyAndCertificate createKeystoreProperties()
     String alias = keystoreProperties.getAlias();
     char[] keyPassword = keystoreProperties.getKeypass().toCharArray();
     Key key = keystore.getKey(alias, keyPassword);
+    // key can be null if alias/password is incorrect.
+    if (key == null) {
+      throw new HumanReadableException(
+          "The keystore [%s] key.alias [%s] does not exist or does not identify a key-related " +
+              "entry",
+          pathToKeystore,
+          alias);
+    }
+
     Certificate certificate = keystore.getCertificate(alias);
 
     return new PrivateKeyAndCertificate((PrivateKey) key, (X509Certificate) certificate);

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

@@ -16,6 +16,7 @@
 
 package com.facebook.buck.android;
 
+import static com.facebook.buck.testutil.RegexMatcher.containsRegex;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
@@ -514,4 +515,21 @@ public void testInstrumentationApkWithEmptyResDepBuildsCorrectly() throws IOExce
     workspace.runBuckBuild("//apps/sample:instrumentation_apk").assertSuccess();
   }
 
+  @Test
+  public void testInvalidKeystoreKeyAlias() throws IOException {
+    workspace.replaceFileContents(
+        "keystores/debug.keystore.properties",
+        "key.alias=my_alias",
+        "key.alias=invalid_alias"
+    );
+
+    workspace.resetBuildLogFile();
+    ProjectWorkspace.ProcessResult result = workspace.runBuckCommand("build", SIMPLE_TARGET);
+    result.assertFailure("Invalid keystore key alias should fail.");
+
+    assertThat(
+        "error message for invalid keystore key alias is incorrect.",
+        result.getStderr(),
+        containsRegex("The keystore \\[.*\\] key\\.alias \\[.*\\].*does not exist"));
+  }
 }

test/com/facebook/buck/android/BUCK

@@ -225,6 +225,7 @@ java_test(
     '//src/com/facebook/buck/zip:stream',
     '//src/com/facebook/buck/zip:unzip',
     '//test/com/facebook/buck/model:BuildTargetFactory',
+    '//test/com/facebook/buck/testutil:testutil',
     '//test/com/facebook/buck/testutil/integration:integration',
     '//third-party/java/commons-compress:commons-compress',
     '//third-party/java/guava:guava',