From 25397f52ff20778cb83902239e07534f717c7d44 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 15 Feb 2019 16:03:58 -0800 Subject: [PATCH] Fix dependencies in strip.sh strip.sh was including the dependencies of dexpreoptRule instead of stripRule, resulting in incorrect rebuilds. Bug: 124529711 Test: m && m Change-Id: I4b40f7c040442a03918c16a46ecf777f5cc30130 --- dexpreopt/dexpreopt_gen/dexpreopt_gen.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dexpreopt/dexpreopt_gen/dexpreopt_gen.go b/dexpreopt/dexpreopt_gen/dexpreopt_gen.go index 1467a028a..cc3c1f10c 100644 --- a/dexpreopt/dexpreopt_gen/dexpreopt_gen.go +++ b/dexpreopt/dexpreopt_gen/dexpreopt_gen.go @@ -133,10 +133,10 @@ func writeScripts(global dexpreopt.GlobalConfig, module dexpreopt.ModuleConfig, depFile := &bytes.Buffer{} fmt.Fprint(depFile, `: \`+"\n") - for _, tool := range dexpreoptRule.Tools() { + for _, tool := range rule.Tools() { fmt.Fprintf(depFile, ` %s \`+"\n", tool) } - for _, input := range dexpreoptRule.Inputs() { + for _, input := range rule.Inputs() { // Assume the rule that ran the script already has a dependency on the input file passed on the // command line. if input != "$1" {