diff options
2 files changed, 14 insertions, 6 deletions
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 index b3fd9279d9..bf0818b776 100644 --- 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 class AndroidNdkRepositoryFunction extends RepositoryFunction { 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 index 7a4968dae3..fb407e3040 100644 --- 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 class AndroidSdkRepositoryFunction extends RepositoryFunction { 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( |