diff options
| author | 2017-08-10 16:32:23 -0700 | |
|---|---|---|
| committer | 2017-08-11 15:24:11 -0700 | |
| commit | 27a4b05441a30a26de0d19cd3495a3d1229a2e57 (patch) | |
| tree | 2bee8414340eeb2547cf014a29260bf94a87291a /java/androidmk.go | |
| parent | 6416271a1f6ec76e5dfac4573eec78bbd4f3ba3b (diff) | |
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 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 92af0ed2d..fd967cb5b 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -24,9 +24,8 @@ import ( func (library *Library) AndroidMk() (ret android.AndroidMkData, err error) { ret.Class = "JAVA_LIBRARIES" ret.OutputFile = android.OptionalPathForPath(library.outputFile) - 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) { fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := .jar") - return nil }) return } @@ -34,9 +33,8 @@ func (library *Library) AndroidMk() (ret android.AndroidMkData, err error) { func (prebuilt *Import) AndroidMk() (ret android.AndroidMkData, err error) { ret.Class = "JAVA_LIBRARIES" ret.OutputFile = android.OptionalPathForPath(prebuilt.combinedClasspathFile) - 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) { fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := .jar") - return nil }) return } |