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

Commit 8eabdd75 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Various small fixes for Linux build 

* add "-latomic" which was missing since we moved to clang
* empty LOG_EVENT_INT stub added for Linux
* add link libraries to fix stack_unittest
* add missing headers

Test: build with ninja
Change-Id: I1fe0b0b615db1da5ad083c162cb207b08979ce15
parent 64da92bb

system/main/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -81,5 +81,6 @@ shared_library("bluetooth.default") { 
    "-lresolv",

    "-lrt",

    "-lz",

    "-latomic",

  ]

}

system/osi/include/log.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#define LOG_WARN(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_ERROR(...) LOGWRAPPER(__VA_ARGS__)



#define LOG_EVENT_INT(...)



#else /* !defined(OS_GENERIC) */



#include <log/log.h>

system/stack/BUILD.gn

+9 −0
Original line number Diff line number Diff line
@@ -198,6 +198,15 @@ executable("stack_unittests") { 
    "//vnd/include"

  ]



  libs = [

    "-ldl",

    "-lpthread",

    "-lresolv",

    "-lrt",

    "-lz",

    "-latomic",

  ]



  deps = [

    ":stack",

    "//osi",

system/test/suite/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -40,5 +40,6 @@ executable("net_test_bluetooth") { 
    "-lpthread",

    "-lrt",

    "-ldl",

    "-latomic",

  ]

}

system/vendor_libs/test_vendor_lib/BUILD.gn

+2 −0
Original line number Diff line number Diff line 
shared_library("test_vendor_lib") {

  sources = [

    "src/async_manager.cc",

    "src/bt_address.cc",

    "src/bt_vendor.cc",

    "src/command_packet.cc",

    "src/dual_mode_controller.cc",
@@ -57,5 +58,6 @@ executable("test_vendor_lib_test") { 
    "-lpthread",

    "-lrt",

    "-ldl",

    "-latomic",

  ]

}