Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2bdc7b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic 'refactor_register'

* changes:
  Refactor module registration
  gofmt -w build/fluoride.go
parents 0afc1b90 00ebce85
Loading
Loading
Loading
Loading
+31 −33
Original line number Diff line number Diff line
@@ -18,19 +18,17 @@ import (

	"android/soong/android"
	"android/soong/cc"

  "github.com/google/blueprint"
)

func init() {
	android.RegisterModuleType("fluoride_defaults", fluorideDefaultsFactory)
}

func fluorideDefaultsFactory() (blueprint.Module, []interface{}) {
  module, props := cc.DefaultsFactory()
func fluorideDefaultsFactory() android.Module {
	module := cc.DefaultsFactory()
	android.AddLoadHook(module, fluorideDefaults)

  return module, props
	return module
}

func fluorideDefaults(ctx android.LoadHookContext) {
@@ -50,7 +48,7 @@ func globalDefaults(ctx android.BaseContext) ([]string, []string) {
	var includeDirs []string

	board_bt_buildcfg_include_dir := ctx.DeviceConfig().BtConfigIncludeDir()
  if (len(board_bt_buildcfg_include_dir) > 0) {
	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)