diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/find_input_delta/find_input_delta/main.go | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | cmd/find_input_delta/find_input_delta_proto_internal/regen.sh | 0 | ||||
| -rw-r--r-- | cmd/soong_ui/main.go | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cmd/find_input_delta/find_input_delta/main.go b/cmd/find_input_delta/find_input_delta/main.go index 036b239d0..65ef88145 100644 --- a/cmd/find_input_delta/find_input_delta/main.go +++ b/cmd/find_input_delta/find_input_delta/main.go @@ -17,11 +17,13 @@ package main import ( "flag" "os" - "strings" + "regexp" fid_lib "android/soong/cmd/find_input_delta/find_input_delta_lib" ) +var fileSepRegex = regexp.MustCompile("[^[:space:]]+") + func main() { var top string var prior_state_file string @@ -46,6 +48,8 @@ func main() { if target == "" { panic("must specify --target") } + // Drop any extra file names that arrived in `target`. + target = fileSepRegex.FindString(target) if prior_state_file == "" { prior_state_file = target + ".pc_state" } @@ -63,7 +67,7 @@ func main() { if err != nil { panic(err) } - inputs = append(inputs, strings.Split(string(data), "\n")...) + inputs = append(inputs, fileSepRegex.FindAllString(string(data), -1)...) } // Read the prior state diff --git a/cmd/find_input_delta/find_input_delta_proto_internal/regen.sh b/cmd/find_input_delta/find_input_delta_proto_internal/regen.sh index cbaf7d056..cbaf7d056 100644..100755 --- a/cmd/find_input_delta/find_input_delta_proto_internal/regen.sh +++ b/cmd/find_input_delta/find_input_delta_proto_internal/regen.sh diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index 972179422..c119823cd 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -215,8 +215,7 @@ func main() { emet.Dump(executionMetricsFile, args) // If there are execution metrics, upload them. if _, err := os.Stat(executionMetricsFile); err == nil { - // TODO: Upload the metrics file. - // metricsFiles = append(metricsFiles, executionMetricsFile) + metricsFiles = append(metricsFiles, executionMetricsFile) } if !config.SkipMetricsUpload() { build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, metricsFiles...) |