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

Commit 83e56801 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Gerrit Code Review
Browse files

Merge "Make build tweaks to support newer libchrome"

parents 93577522 08f29c81

system/btif/avrcp/avrcp_service.cc

+3 −2
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ 
#include <mutex>

#include <sstream>



#include "abstract_message_loop.h"

#include "btif_av.h"

#include "btif_dm.h"

#include "btif_common.h"

#include "btif_dm.h"

#include "device.h"

#include "stack/include/btu.h"
@@ -36,7 +37,7 @@ AvrcpService* AvrcpService::instance_ = nullptr; 
AvrcpService::ServiceInterfaceImpl* AvrcpService::service_interface_ = nullptr;



std::mutex jni_mutex_;

base::MessageLoop* jni_message_loop_ = nullptr;

btbase::AbstractMessageLoop* jni_message_loop_ = nullptr;

base::CancelableTaskTracker task_tracker_;



void do_in_avrcp_jni(const base::Closure& task) {

system/btif/include/btif_common.h

+2 −2
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 


#include <base/bind.h>

#include <base/location.h>

#include <base/message_loop/message_loop.h>

#include <hardware/bluetooth.h>



#include "abstract_message_loop.h"

#include "bt_types.h"

#include "bta/include/bta_api.h"

#include "osi/include/log.h"
@@ -154,7 +154,7 @@ extern bt_status_t do_in_jni_thread(base::OnceClosure task); 
extern bt_status_t do_in_jni_thread(const base::Location& from_here,

                                    base::OnceClosure task);

extern bool is_on_jni_thread();

extern base::MessageLoop* get_jni_message_loop();

extern btbase::AbstractMessageLoop* get_jni_message_loop();

/**

 * This template wraps callback into callback that will be executed on jni

 * thread

system/btif/src/btif_core.cc

+4 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <sys/types.h>

#include <unistd.h>



#include "abstract_message_loop.h"

#include "bt_common.h"

#include "bt_utils.h"

#include "bta_api.h"
@@ -183,7 +184,9 @@ bool is_on_jni_thread() { 
  return jni_thread.GetThreadId() == PlatformThread::CurrentId();

}



base::MessageLoop* get_jni_message_loop() { return jni_thread.message_loop(); }

btbase::AbstractMessageLoop* get_jni_message_loop() {

  return jni_thread.message_loop();

}



/*******************************************************************************

 *

system/common/benchmark/thread_performance_benchmark.cc

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <memory>

#include <thread>



#include "abstract_message_loop.h"

#include "common/message_loop_thread.h"

#include "osi/include/fixed_queue.h"

#include "osi/include/thread.h"
@@ -93,7 +94,7 @@ class BM_MessageLoop : public BM_ThreadPerformance { 
    return nullptr;

  }

  void RunMessageLoop() {

    message_loop_ = new base::MessageLoop();

    message_loop_ = new btbase::AbstractMessageLoop();

    run_loop_ = new base::RunLoop();

    message_loop_->task_runner()->PostTask(

        FROM_HERE, base::BindOnce(&std::promise<void>::set_value,
@@ -106,7 +107,7 @@ class BM_MessageLoop : public BM_ThreadPerformance { 
  }



 protected:

  base::MessageLoop* message_loop_ = nullptr;

  btbase::AbstractMessageLoop* message_loop_ = nullptr;

  base::RunLoop* run_loop_ = nullptr;

};

system/common/message_loop_thread.cc

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ void MessageLoopThread::RunThread(MessageLoopThread* thread, 
  thread->Run(std::move(start_up_promise));

}



base::MessageLoop* MessageLoopThread::message_loop() const {

btbase::AbstractMessageLoop* MessageLoopThread::message_loop() const {

  ASSERT_LOG(!is_main_,

             "you are not allowed to get the main thread's message loop");
@@ -224,7 +224,7 @@ void MessageLoopThread::Run(std::promise<void> start_up_promise) { 
    LOG(INFO) << __func__ << ": message loop starting for thread "

              << thread_name_;

    base::PlatformThread::SetName(thread_name_);

    message_loop_ = new base::MessageLoop();

    message_loop_ = new btbase::AbstractMessageLoop();

    run_loop_ = new base::RunLoop();

    thread_id_ = base::PlatformThread::CurrentId();

    linux_tid_ = static_cast<pid_t>(syscall(SYS_gettid));