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

Commit c55b2ad4 authored by Frederick Mayle's avatar Frederick Mayle Committed by Android (Google) Code Review
Browse files

Merge "init: disable destructors on global and static variables" into main

parents 420cb951 5e4d4a1c

fs_mgr/libdm/include/libdm/dm_target.h

+1 −3
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ class DmTargetDefaultKey final : public DmTarget { 
          blockdev_(blockdev),

          start_sector_(start_sector) {}



    std::string name() const override { return kName; }

    std::string name() const override { return "default-key"; }

    bool Valid() const override;

    std::string GetParameterString() const override;

    void SetUseLegacyOptionsFormat() { use_legacy_options_format_ = true; }
@@ -317,8 +317,6 @@ class DmTargetDefaultKey final : public DmTarget { 
    void SetWrappedKeyV0() { is_hw_wrapped_ = true; }



  private:

    inline static const std::string kName = "default-key";



    std::string cipher_;

    std::string key_;

    std::string blockdev_;

init/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ init_first_stage_cc_defaults { 
        "-Wall",

        "-Wextra",

        "-Wno-unused-parameter",

        "-Wexit-time-destructors",

        "-Werror",

        "-DALLOW_FIRST_STAGE_CONSOLE=0",

        "-DALLOW_LOCAL_PROP_OVERRIDE=0",

init/bootchart.cpp

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ namespace init { 


static std::thread* g_bootcharting_thread;



static std::mutex g_bootcharting_finished_mutex;

static std::condition_variable g_bootcharting_finished_cv;

[[clang::no_destroy]] static std::mutex g_bootcharting_finished_mutex;

[[clang::no_destroy]] static std::condition_variable g_bootcharting_finished_cv;

static bool g_bootcharting_finished;



static long long get_uptime_jiffies() {

init/builtins.cpp

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ inline ErrorIgnoreEnoent ErrnoErrorIgnoreEnoent() { 
    return ErrorIgnoreEnoent(errno);

}



std::vector<std::string> late_import_paths;

[[clang::no_destroy]] std::vector<std::string> late_import_paths;



static constexpr std::chrono::nanoseconds kCommandRetryTimeout = 5s;

init/capabilities.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
namespace android {

namespace init {



static const std::map<std::string, int> cap_map = {

[[clang::no_destroy]] static const std::map<std::string, int> cap_map = {

        CAP_MAP_ENTRY(CHOWN),

        CAP_MAP_ENTRY(DAC_OVERRIDE),

        CAP_MAP_ENTRY(DAC_READ_SEARCH),