diff options
| author | Colin Cross <ccross@android.com> | 2017-08-10 16:59:47 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-08-11 15:24:11 -0700 |
| commit | 91825d2279fb9066ec6ffd4ce2070eb070ce38cf (patch) | |
| tree | 93a9ee166e6e28081af9fbfe884cde4cbc67663d /phony | |
| parent | 27a4b05441a30a26de0d19cd3495a3d1229a2e57 (diff) | |
| download | build_soong-91825d2279fb9066ec6ffd4ce2070eb070ce38cf.tar.gz build_soong-91825d2279fb9066ec6ffd4ce2070eb070ce38cf.tar.bz2 build_soong-91825d2279fb9066ec6ffd4ce2070eb070ce38cf.zip | |
Remove error from AndroidMkData.Custom
It's never anything except nil, and it unnecessarily complicates
the implementations.
Test: m -j checkbuild
Change-Id: I021c7971ede3e11bbe08cf1601f4690ed4d1a036
Diffstat (limited to 'phony')
| -rw-r--r-- | phony/phony.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/phony/phony.go b/phony/phony.go index 79f3a1ba..053ed560 100644 --- a/phony/phony.go +++ b/phony/phony.go @@ -49,14 +49,12 @@ func (p *phony) GenerateAndroidBuildActions(ctx android.ModuleContext) { } func (p *phony) AndroidMk() (ret android.AndroidMkData, err error) { - ret.Custom = func(w io.Writer, name, prefix, moduleDir string) error { + ret.Custom = func(w io.Writer, name, prefix, moduleDir string) { fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)") fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir) fmt.Fprintln(w, "LOCAL_MODULE :=", name) fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES := "+strings.Join(p.requiredModuleNames, " ")) fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)") - - return nil } return } |