diff options
author | Colin Cross <ccross@android.com> | 2019-02-11 14:11:09 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2019-02-13 08:03:29 -0800 |
commit | deabb94380ad37d89e164946f8076adf433bfa22 (patch) | |
tree | 9e385ba01c2fbce9e629579f1ea5933e33bec102 /java/dexpreopt.go | |
parent | bd907cb12bad59f35bdb73476c9a785d7be06b7d (diff) | |
download | android_build_soong-deabb94380ad37d89e164946f8076adf433bfa22.tar.gz android_build_soong-deabb94380ad37d89e164946f8076adf433bfa22.tar.bz2 android_build_soong-deabb94380ad37d89e164946f8076adf433bfa22.zip |
Add RuleBuilder.Installs().String()
Add a RuleBuilderInstalls type for a slice of RuleBuilderInstalls,
and give it a String() method that returns the list of installs
in the format that is convenient for passing to Make.
Test: rule_builder_test.go
Change-Id: I2e9cd9abf4dfb0ad312d0a6662f1567baf9cd222
Diffstat (limited to 'java/dexpreopt.go')
-rw-r--r-- | java/dexpreopt.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go index a89731ac..127deab9 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -28,7 +28,7 @@ type dexpreopter struct { isTest bool isInstallable bool - builtInstalled []string + builtInstalled string } type DexpreoptProperties struct { @@ -196,9 +196,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo dexpreoptRule.Build(pctx, ctx, "dexpreopt", "dexpreopt") - for _, install := range dexpreoptRule.Installs() { - d.builtInstalled = append(d.builtInstalled, install.From+":"+install.To) - } + d.builtInstalled = dexpreoptRule.Installs().String() stripRule, err := dexpreopt.GenerateStripRule(globalConfig, dexpreoptConfig) if err != nil { |