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

Commit 321803cb authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Gerrit Code Review
Browse files

Merge "Add TARGET_FLOSS define"

parents 6741b108 d1895cee

BUILD.gn

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ config("target_defaults") { 
    "HAS_NO_BDROID_BUILDCFG",

    "OS_GENERIC",

    "OS_LINUX_GENERIC",

    "TARGET_FLOSS",

    "USE_LINUX_HCI_SOCKET",

    "EXPORT_SYMBOL=__attribute__((visibility(\"default\")))",

    "FALLTHROUGH_INTENDED=[[clang::fallthrough]]",

  ]

system/btif/src/btif_core.cc

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static void bt_jni_msg_ready(void* context); 


#ifndef BTE_DID_CONF_FILE

// TODO(armansito): Find a better way than searching by a hardcoded path.

#if defined(OS_GENERIC)

#if defined(OS_GENERIC) && !defined(TARGET_FLOSS)

#define BTE_DID_CONF_FILE "bt_did.conf"

#else  // !defined(OS_GENERIC)

#define BTE_DID_CONF_FILE "/etc/bluetooth/bt_did.conf"

system/gd/os/linux/parameter_provider.cc

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ std::string ParameterProvider::ConfigFilePath() { 
      return config_file_path;

    }

  }

  return "/etc/systembt/bt_config.conf";

  return "/etc/bluetooth/bt_config.conf";

}



void ParameterProvider::OverrideConfigFilePath(const std::string& path) {
@@ -58,7 +58,7 @@ std::string ParameterProvider::SnoopLogFilePath() { 
    }

  }



  return "/etc/systembt/btsnoop_hci.log";

  return "/etc/bluetooth/btsnoop_hci.log";

}



void ParameterProvider::OverrideSnoopLogFilePath(const std::string& path) {

system/main/stack_config.cc

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static std::unique_ptr<config_t> config; 


static future_t* init() {

// TODO(armansito): Find a better way than searching by a hardcoded path.

#if defined(OS_GENERIC)

#if defined(OS_GENERIC) && !defined(TARGET_FLOSS)

  const char* path = "bt_stack.conf";

#else  // !defined(OS_GENERIC)

  const char* path = "/etc/bluetooth/bt_stack.conf";