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/androidmk.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/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index d86e71f9..04b328dc 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -65,7 +65,7 @@ func (library *Library) AndroidMk() android.AndroidMkData { fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", library.dexJarFile.String()) } if len(library.dexpreopter.builtInstalled) > 0 { - fmt.Fprintln(w, "LOCAL_SOONG_BUILT_INSTALLED :=", strings.Join(library.dexpreopter.builtInstalled, " ")) + fmt.Fprintln(w, "LOCAL_SOONG_BUILT_INSTALLED :=", library.dexpreopter.builtInstalled) } fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", library.sdkVersion()) fmt.Fprintln(w, "LOCAL_SOONG_CLASSES_JAR :=", library.implementationAndResourcesJar.String()) @@ -166,7 +166,7 @@ func (binary *Binary) AndroidMk() android.AndroidMkData { fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", binary.dexJarFile.String()) } if len(binary.dexpreopter.builtInstalled) > 0 { - fmt.Fprintln(w, "LOCAL_SOONG_BUILT_INSTALLED :=", strings.Join(binary.dexpreopter.builtInstalled, " ")) + fmt.Fprintln(w, "LOCAL_SOONG_BUILT_INSTALLED :=", binary.dexpreopter.builtInstalled) } }, }, @@ -260,7 +260,7 @@ func (app *AndroidApp) AndroidMk() android.AndroidMkData { fmt.Fprintln(w, "LOCAL_SOONG_JNI_LIBS_"+jniLib.target.Arch.ArchType.String(), "+=", jniLib.name) } if len(app.dexpreopter.builtInstalled) > 0 { - fmt.Fprintln(w, "LOCAL_SOONG_BUILT_INSTALLED :=", strings.Join(app.dexpreopter.builtInstalled, " ")) + fmt.Fprintln(w, "LOCAL_SOONG_BUILT_INSTALLED :=", app.dexpreopter.builtInstalled) } }, }, |