opendev/gerrit
Code Issues Proposed changes

Get rid of references to .primary_build_tool

Browse Source 
This was introduced to support both buck and bazel build tools, and
is no longer necessary since we completely dropped buck in favor of
bazel.

Change-Id: I5fc96bf1fc27f20180737fea954e150070e5302f
This commit is contained in:
David Pursehouse
2017-03-14 21:36:28 +09:00
parent c087c37487
commit 34b59f0ad3
3 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/BazelBuild.java
View File

@@ -14,11 +14,8 @@
package com.google.gerrit.httpd.raw;
import static com.google.common.base.MoreObjects.firstNonNull;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Properties;
public class BazelBuild extends BuildSystem {
public BazelBuild(Path sourceRoot) {
@@ -27,13 +24,7 @@ public class BazelBuild extends BuildSystem {
@Override
protected ProcessBuilder newBuildProcess(Label label) throws IOException {
Properties properties = loadBuildProperties(sourceRoot.resolve(".primary_build_tool"));
String bazel = firstNonNull(properties.getProperty("bazel"), "bazel");
ProcessBuilder proc = new ProcessBuilder(bazel, "build", label.fullName());
if (properties.containsKey("PATH")) {
proc.environment().put("PATH", properties.getProperty("PATH"));
}
return proc;
return new ProcessBuilder("bazel", "build", label.fullName());
}
@Override