diff options
| author | Colin Cross <ccross@android.com> | 2017-08-10 17:00:19 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-08-11 15:24:11 -0700 |
| commit | a18e9cfa29d22949d2c005fe2b51c5ffa2bf6379 (patch) | |
| tree | fd4733237ef52794c6a0d2e5b63e617b93613b06 /phony | |
| parent | 91825d2279fb9066ec6ffd4ce2070eb070ce38cf (diff) | |
| download | build_soong-a18e9cfa29d22949d2c005fe2b51c5ffa2bf6379.tar.gz build_soong-a18e9cfa29d22949d2c005fe2b51c5ffa2bf6379.tar.bz2 build_soong-a18e9cfa29d22949d2c005fe2b51c5ffa2bf6379.zip | |
Remove error from AndroidMkDataProvider.AndroidMk
It's never anything except nil, and it unnecessarily complicates
the implementations.
Test: m -j checkbuild
Change-Id: I3e3b7251f32ffa84dbdfd0448faf248c306ca808
Diffstat (limited to 'phony')
| -rw-r--r-- | phony/phony.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/phony/phony.go b/phony/phony.go index 053ed560..5f0187f9 100644 --- a/phony/phony.go +++ b/phony/phony.go @@ -48,13 +48,14 @@ 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) { - 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)") +func (p *phony) AndroidMk() android.AndroidMkData { + return android.AndroidMkData{ + 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 } |