diff options
| author | Colin Cross <ccross@android.com> | 2017-08-10 16:32:23 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-08-11 15:24:11 -0700 |
| commit | 27a4b05441a30a26de0d19cd3495a3d1229a2e57 (patch) | |
| tree | 2bee8414340eeb2547cf014a29260bf94a87291a /python | |
| parent | 6416271a1f6ec76e5dfac4573eec78bbd4f3ba3b (diff) | |
| download | build_soong-27a4b05441a30a26de0d19cd3495a3d1229a2e57.tar.gz build_soong-27a4b05441a30a26de0d19cd3495a3d1229a2e57.tar.bz2 build_soong-27a4b05441a30a26de0d19cd3495a3d1229a2e57.zip | |
Remove error from AndroidMkData.Extra
It's never anything except nil, and it unnecessarily complicates
the implementations.
Test: m -j checkbuild
Change-Id: I8a117a86aa39aeb07d9d8d0686ef869c52784f19
Diffstat (limited to 'python')
| -rw-r--r-- | python/androidmk.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/python/androidmk.go b/python/androidmk.go index 0a79e736..386eeeed 100644 --- a/python/androidmk.go +++ b/python/androidmk.go @@ -61,7 +61,7 @@ func (installer *pythonInstaller) AndroidMk(base *pythonBaseModule, ret *android ret.OutputFile = android.OptionalPathForPath(installer.path) } - ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error { + ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) { path := installer.path.RelPathString() dir, file := filepath.Split(path) stem := strings.TrimSuffix(file, filepath.Ext(file)) @@ -69,6 +69,5 @@ func (installer *pythonInstaller) AndroidMk(base *pythonBaseModule, ret *android fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+filepath.Ext(file)) fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(OUT_DIR)/"+filepath.Clean(dir)) fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem) - return nil }) } |