From 2cf6e71b0a7d46d78263b566c907b355b8dccd0a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 27 Jun 2017 11:15:25 -0700 Subject: [PATCH] gofmt -w build/fluoride.go Test: builds Change-Id: I158eff9274c97eb59e4e3a63a39d0d5df501cee4 --- build/fluoride.go | 58 +++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/build/fluoride.go b/build/fluoride.go index c96d5fe0a..951b81623 100644 --- a/build/fluoride.go +++ b/build/fluoride.go @@ -14,52 +14,52 @@ package fluoride import ( - "strings" + "strings" - "android/soong/android" - "android/soong/cc" + "android/soong/android" + "android/soong/cc" - "github.com/google/blueprint" + "github.com/google/blueprint" ) func init() { - android.RegisterModuleType("fluoride_defaults", fluorideDefaultsFactory) + android.RegisterModuleType("fluoride_defaults", fluorideDefaultsFactory) } func fluorideDefaultsFactory() (blueprint.Module, []interface{}) { - module, props := cc.DefaultsFactory() - android.AddLoadHook(module, fluorideDefaults) + module, props := cc.DefaultsFactory() + android.AddLoadHook(module, fluorideDefaults) - return module, props + return module, props } func fluorideDefaults(ctx android.LoadHookContext) { - type props struct { - Include_dirs []string - Cflags []string - } + type props struct { + Include_dirs []string + Cflags []string + } - p := &props{} - p.Cflags, p.Include_dirs = globalDefaults(ctx) + p := &props{} + p.Cflags, p.Include_dirs = globalDefaults(ctx) - ctx.AppendProperties(p) + ctx.AppendProperties(p) } func globalDefaults(ctx android.BaseContext) ([]string, []string) { - var cflags []string - var includeDirs []string + var cflags []string + var includeDirs []string - board_bt_buildcfg_include_dir := ctx.DeviceConfig().BtConfigIncludeDir() - if (len(board_bt_buildcfg_include_dir) > 0) { - cflags = append(cflags, "-DHAS_BDROID_BUILDCFG") - board_bt_buildcfg_include_dir_list := - strings.Fields(board_bt_buildcfg_include_dir) - for _, buildcfg_dir := range board_bt_buildcfg_include_dir_list { - includeDirs = append(includeDirs, buildcfg_dir) - } - } else { - cflags = append(cflags, "-DHAS_NO_BDROID_BUILDCFG") - } + board_bt_buildcfg_include_dir := ctx.DeviceConfig().BtConfigIncludeDir() + if len(board_bt_buildcfg_include_dir) > 0 { + cflags = append(cflags, "-DHAS_BDROID_BUILDCFG") + board_bt_buildcfg_include_dir_list := + strings.Fields(board_bt_buildcfg_include_dir) + for _, buildcfg_dir := range board_bt_buildcfg_include_dir_list { + includeDirs = append(includeDirs, buildcfg_dir) + } + } else { + cflags = append(cflags, "-DHAS_NO_BDROID_BUILDCFG") + } - return cflags, includeDirs + return cflags, includeDirs } -- 2.11.0