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

Commit 98787d8e authored by David Duarte's avatar David Duarte
Browse files

Remove OS_LINUX_GENERIC 

It was always defined (linux and android)

Test: TreeHugger
Bug: 279502784
Change-Id: If53c4ea123958b81b3e679ac64e9063bdc5a035c
parent b54d4112

system/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ config("target_defaults") { 
  cflags_cc = [ "-std=c++17" ]



  defines = [

    "OS_LINUX_GENERIC",

    "TARGET_FLOSS",

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

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

system/gd/Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ cc_defaults { 
    target: {

        android: {

            test_config_template: "AndroidTestTemplate.xml",

            cflags: [

                "-DOS_LINUX_GENERIC",

            ],

            shared_libs: [

                "liblog",

            ],
@@ -29,11 +26,6 @@ cc_defaults { 
                misc_undefined: ["bounds"],

            },

        },

        host: {

            cflags: [

                "-DOS_LINUX_GENERIC",

            ],

        },

        darwin: {

            enabled: false,

        },

system/gd/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ config("gd_defaults") { 
  ]



  defines = [

    "OS_LINUX_GENERIC",

    "TARGET_FLOSS",

  ]

system/gd/os/queue.h

+0 −6
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ 
#include "common/bind.h"

#include "common/callback.h"

#include "os/handler.h"

#ifdef OS_LINUX_GENERIC

#include "os/linux_generic/reactive_semaphore.h"

#endif

#include "os/log.h"



namespace bluetooth {
@@ -89,11 +87,9 @@ class Queue : public IQueueEnqueue<T>, public IQueueDequeue<T> { 


  class QueueEndpoint {

   public:

#ifdef OS_LINUX_GENERIC

    explicit QueueEndpoint(unsigned int initial_value)

        : reactive_semaphore_(initial_value), handler_(nullptr), reactable_(nullptr) {}

    ReactiveSemaphore reactive_semaphore_;

#endif

    Handler* handler_;

    Reactor::Reactable* reactable_;

  };
@@ -161,9 +157,7 @@ class EnqueueBuffer { 
  common::OnceClosure callback_on_empty_;

};



#ifdef OS_LINUX_GENERIC

#include "os/linux_generic/queue.tpp"

#endif



}  // namespace os

}  // namespace bluetooth