Correctly returns null if an environment variables is missing

damienmg · vladmos · commit e8d1177eef9a · 2017-03-07T10:47:03.000Z
The hard part is to test this one as we haven't even been able to reproduce. Maybe we should just fuzz Skyframe function for null values. Fixes bazelbuild#2621. To cherry-pick for 0.4.5 (bazelbuild#2472) -- Change-Id: Ida489fb8dbd659b42a8d2bebff58d49ffeaf72c3 Reviewed-on: https://cr.bazel.build/9213 PiperOrigin-RevId: 149316508 MOS_MIGRATED_REVID=149316508
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java
@@ -96,14 +96,18 @@ public boolean verifyMarkerData(Rule rule, Map<String, String> markerData, Envir
   public RepositoryDirectoryValue.Builder fetch(Rule rule, Path outputDirectory,
       BlazeDirectories directories, Environment env, Map<String, String> markerData)
       throws InterruptedException, RepositoryFunctionException {
-    declareEnvironmentDependencies(markerData, env, PATH_ENV_VAR_AS_LIST);
+    Map<String, String> environ =
+        declareEnvironmentDependencies(markerData, env, PATH_ENV_VAR_AS_LIST);
+    if (environ == null) {
+      return null;
+    }
     prepareLocalRepositorySymlinkTree(rule, outputDirectory);
     WorkspaceAttributeMapper attributes = WorkspaceAttributeMapper.of(rule);
     PathFragment pathFragment;
     if (attributes.isAttributeValueExplicitlySpecified("path")) {
       pathFragment = getTargetPath(rule, directories.getWorkspace());
-    } else if (clientEnvironment.containsKey(PATH_ENV_VAR)) {
-      pathFragment = getAndroidNdkHomeEnvironmentVar(directories.getWorkspace(), clientEnvironment);
+    } else if (environ.containsKey(PATH_ENV_VAR)) {
+      pathFragment = getAndroidNdkHomeEnvironmentVar(directories.getWorkspace(), environ);
     } else {
       throw new RepositoryFunctionException(
           new EvalException(
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java
@@ -82,16 +82,20 @@ public boolean verifyMarkerData(Rule rule, Map<String, String> markerData, Envir
   public RepositoryDirectoryValue.Builder fetch(Rule rule, Path outputDirectory,
       BlazeDirectories directories, Environment env, Map<String, String> markerData)
       throws SkyFunctionException, InterruptedException {
-    declareEnvironmentDependencies(markerData, env, PATH_ENV_VAR_AS_LIST);
+    Map<String, String> environ =
+        declareEnvironmentDependencies(markerData, env, PATH_ENV_VAR_AS_LIST);
+    if (environ == null) {
+      return null;
+    }
     prepareLocalRepositorySymlinkTree(rule, outputDirectory);
     WorkspaceAttributeMapper attributes = WorkspaceAttributeMapper.of(rule);
     FileSystem fs = directories.getOutputBase().getFileSystem();
     Path androidSdkPath;
     if (attributes.isAttributeValueExplicitlySpecified("path")) {
       androidSdkPath = fs.getPath(getTargetPath(rule, directories.getWorkspace()));
-    } else if (clientEnvironment.containsKey(PATH_ENV_VAR)){
+    } else if (environ.containsKey(PATH_ENV_VAR)){
       androidSdkPath =
-          fs.getPath(getAndroidHomeEnvironmentVar(directories.getWorkspace(), clientEnvironment));
+          fs.getPath(getAndroidHomeEnvironmentVar(directories.getWorkspace(), environ));
     } else {
       throw new RepositoryFunctionException(
           new EvalException(
