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

Commit d13d2334 authored by Jack He's avatar Jack He Committed by Myles Watson
Browse files

Fix parser for BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR 

* Current parser does not support multi-directory lists, which may cause
  a build failure if BoardConfig.mk defines one.
* This CL splits the list of directories using whitespace and adds them
  individually to the include list

Bug: 34396100
Test: Code compilation, no user visible effect
Change-Id: I59e901d76d1bc20f50b54941a3007c5521ded214
parent 65b2a57b

system/build/fluoride.go

+7 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
package fluoride



import (

  "strings"



  "android/soong/android"

  "android/soong/cc"
@@ -50,7 +52,11 @@ func globalDefaults(ctx android.BaseContext) ([]string, []string) { 
  board_bt_buildcfg_include_dir := ctx.DeviceConfig().BtConfigIncludeDir()

  if (len(board_bt_buildcfg_include_dir) > 0) {

    cflags = append(cflags, "-DHAS_BDROID_BUILDCFG")

    includeDirs = append(includeDirs, board_bt_buildcfg_include_dir)

    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")

  }