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

Commit a23f9b68 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "sysprops_module: do not link for android" into main

parents a5ab7bec d9786bdf

system/gd/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ cc_defaults { 
        ":BluetoothPacketSources",

        ":BluetoothSecuritySources",

        ":BluetoothStorageSources",

        ":BluetoothSyspropsSources",

        "module.cc",

        "module_dumper.cc",

        "stack_manager.cc",

system/gd/hci/controller.cc

+4 −0
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ 
#include "os/log.h"

#include "os/metrics.h"

#include "os/system_properties.h"

#if TARGET_FLOSS

#include "sysprops/sysprops_module.h"

#endif



namespace bluetooth {

namespace hci {
@@ -1537,7 +1539,9 @@ const ModuleFactory Controller::Factory = ModuleFactory([]() { return new Contro 


void Controller::ListDependencies(ModuleList* list) const {

  list->add<hci::HciLayer>();

#if TARGET_FLOSS

  list->add<sysprops::SyspropsModule>();

#endif

}



void Controller::Start() {

system/gd/sysprops/sysprops_module.h

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
 */

#pragma once



#if !defined(TARGET_FLOSS)

#error "sysprops_module is supposed to be FLOSS specific"

#endif



#include "module.h"



namespace bluetooth {

system/main/shim/stack.cc

+4 −0
Original line number Diff line number Diff line
@@ -51,7 +51,9 @@ 
#include "os/log.h"

#include "shim/dumpsys.h"

#include "storage/storage_module.h"

#if TARGET_FLOSS

#include "sysprops/sysprops_module.h"

#endif



namespace bluetooth {

namespace shim {
@@ -82,7 +84,9 @@ void Stack::StartEverything() { 
  modules.add<storage::StorageModule>();

  modules.add<shim::Dumpsys>();

  modules.add<hci::VendorSpecificEventManager>();

#if TARGET_FLOSS

  modules.add<sysprops::SyspropsModule>();

#endif



  modules.add<hci::Controller>();

  modules.add<hci::acl_manager::AclScheduler>();