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

Commit b6e6e424 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Automerger Merge Worker
Browse files

Merge "floss: Fix build faliure: non-void function does not return a value"... 

Merge "floss: Fix build faliure: non-void function does not return a value" into main am: 506078a6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3239274



Change-Id: Ie051481a2e3eb499271814e7d467927c2099f581
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d651c4e 506078a6

build.py

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ class HostBuild(): 
            'enable_exceptions': os.environ.get('CXXEXCEPTIONS', 0) == '1',

            'external_cflags': [],

            'external_cxxflags': ["-DNDEBUG"],

            'enable_werror': False,

            'enable_werror': True,

        }



        if clang:

system/btif/src/bluetooth.cc

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static bool is_profile(const char* p1, const char* p2) { 
#ifdef TARGET_FLOSS

static int global_hci_adapter = 0;



static int set_adapter_index(int adapter) { global_hci_adapter = adapter; }

static void set_adapter_index(int adapter) { global_hci_adapter = adapter; }

int GetAdapterIndex() { return global_hci_adapter; }

#else

int GetAdapterIndex() { return 0; }  // Unsupported outside of FLOSS

system/gd/rust/linux/service/src/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ fn main() -> Result<(), Box<dyn Error>> { 
    let hci_index = matches.value_of("hci").map_or(0, |idx| idx.parse::<i32>().unwrap_or(0));



    // The remaining flags are passed down to Fluoride as is.

    let mut init_flags: Vec<String> = match matches.values_of("init-flags") {

    let init_flags: Vec<String> = match matches.values_of("init-flags") {

        Some(args) => args.map(String::from).collect(),

        None => vec![],

    };

system/include/hardware/bluetooth.h

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ typedef struct { 
  size_t size;

#ifdef TARGET_FLOSS

  /** set index of the adapter to use */

  int (*set_adapter_index)(int adapter_index);

  void (*set_adapter_index)(int adapter_index);

#endif



  /**