tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove error from AndroidMkData.Custom

Browse source 
It's never anything except nil, and it unnecessarily complicates
the implementations.

Test: m -j checkbuild
Change-Id: I021c7971ede3e11bbe08cf1601f4690ed4d1a036
This commit is contained in:
Colin Cross 2017-08-10 16:59:47 -07:00
parent 27a4b05441
commit 91825d2279
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/androidmk.go
View file

@ -43,7 +43,7 @@ type AndroidMkData struct {
OutputFile OptionalPath OutputFile OptionalPath
Disabled bool Disabled bool
Custom func(w io.Writer, name, prefix, moduleDir string) error Custom func(w io.Writer, name, prefix, moduleDir string)
Extra []AndroidMkExtraFunc Extra []AndroidMkExtraFunc
} }
@ -159,10 +159,7 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b
return nil return nil
} }
data, err := provider.AndroidMk() data := provider.AndroidMk()
if err != nil {
return err
}
// Make does not understand LinuxBionic // Make does not understand LinuxBionic
if amod.Os() == LinuxBionic { if amod.Os() == LinuxBionic {
@ -192,7 +189,9 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b
} }
} }
return data.Custom(w, name, prefix, filepath.Dir(ctx.BlueprintFile(mod))) data.Custom(w, name, prefix, filepath.Dir(ctx.BlueprintFile(mod)))
return nil
} }
if data.Disabled { if data.Disabled {
@ -200,7 +199,7 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b
} }
if !data.OutputFile.Valid() { if !data.OutputFile.Valid() {
return err return nil
} }
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)") fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
@ -262,5 +261,5 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b
fmt.Fprintln(w, "include $(BUILD_PREBUILT)") fmt.Fprintln(w, "include $(BUILD_PREBUILT)")
return err return nil
} }

8
cc/androidmk.go
View file

@ -131,7 +131,7 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An
ret.Class = "SHARED_LIBRARIES" ret.Class = "SHARED_LIBRARIES"
} else if library.header() { } else if library.header() {
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, "\ninclude $(CLEAR_VARS)")
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir) fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
fmt.Fprintln(w, "LOCAL_MODULE :=", name) fmt.Fprintln(w, "LOCAL_MODULE :=", name)
@ -158,8 +158,6 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An
library.androidMkWriteExportedFlags(w) library.androidMkWriteExportedFlags(w)
fmt.Fprintln(w, "include $(BUILD_HEADER_LIBRARY)") fmt.Fprintln(w, "include $(BUILD_HEADER_LIBRARY)")
return nil
} }
return return
@ -191,13 +189,11 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An
} }
func (object *objectLinker) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { func (object *objectLinker) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
ret.Custom = func(w io.Writer, name, prefix, moduleDir string) error { ret.Custom = func(w io.Writer, name, prefix, moduleDir string) {
out := ret.OutputFile.Path() out := ret.OutputFile.Path()
fmt.Fprintln(w, "\n$("+prefix+"OUT_INTERMEDIATE_LIBRARIES)/"+name+objectExtension+":", out.String()) fmt.Fprintln(w, "\n$("+prefix+"OUT_INTERMEDIATE_LIBRARIES)/"+name+objectExtension+":", out.String())
fmt.Fprintln(w, "\t$(copy-file-to-target)") fmt.Fprintln(w, "\t$(copy-file-to-target)")
return nil
} }
} }

4
phony/phony.go
View file

@ -49,14 +49,12 @@ func (p *phony) GenerateAndroidBuildActions(ctx android.ModuleContext) {
} }
func (p *phony) AndroidMk() (ret android.AndroidMkData, err error) { 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, "\ninclude $(CLEAR_VARS)")
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir) fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
fmt.Fprintln(w, "LOCAL_MODULE :=", name) fmt.Fprintln(w, "LOCAL_MODULE :=", name)
fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES := "+strings.Join(p.requiredModuleNames, " ")) fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES := "+strings.Join(p.requiredModuleNames, " "))
fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)") fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)")
return nil
} }
return return
} }