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

Commit 4d85b79e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5452883 from 83e52ce9 to qt-release 

Change-Id: I759a51e860c455cad32b8e2eb2e73a3beb8a6032
parents dc0ffd9f 83e52ce9

debuggerd/libdebuggerd/include/libdebuggerd/utility.h

+9 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#ifndef _DEBUGGERD_UTILITY_H

#define _DEBUGGERD_UTILITY_H



#include <inttypes.h>

#include <signal.h>

#include <stdbool.h>

#include <sys/types.h>
@@ -25,7 +26,6 @@ 
#include <string>



#include <android-base/macros.h>

#include <backtrace/Backtrace.h>



struct log_t {

  // Tombstone file descriptor.
@@ -61,6 +61,14 @@ enum logtype { 
  OPEN_FILES

};



#if defined(__LP64__)

#define PRIPTR "016" PRIx64

typedef uint64_t word_t;

#else

#define PRIPTR "08" PRIx64

typedef uint32_t word_t;

#endif



// Log information onto the tombstone.

void _LOG(log_t* log, logtype ltype, const char* fmt, ...) __attribute__((format(printf, 3, 4)));

debuggerd/libdebuggerd/test/tombstone_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <stdlib.h>

#include <sys/mman.h>

#include <time.h>



#include <memory>

debuggerd/libdebuggerd/tombstone.cpp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/mman.h>

#include <sys/ptrace.h>

#include <sys/stat.h>

#include <time.h>

debuggerd/libdebuggerd/utility.cpp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <android-base/unique_fd.h>

#include <backtrace/Backtrace.h>

#include <debuggerd/handler.h>

#include <log/log.h>

#include <unwindstack/Memory.h>

fastboot/fuzzy_fastboot/main.cpp

+17 −7
Original line number Diff line number Diff line
@@ -201,18 +201,28 @@ TEST_F(LogicalPartitionCompliance, GetVarIsLogical) { 
    ASSERT_TRUE(UserSpaceFastboot());

    std::string has_slot;

    EXPECT_EQ(fb->GetVar("has-slot:system", &has_slot), SUCCESS) << "getvar has-slot:system failed";

    std::string is_logical_cmd;

    std::string is_logical_cmd_system = "is-logical:system";

    std::string is_logical_cmd_vendor = "is-logical:vendor";

    std::string is_logical_cmd_boot = "is-logical:boot";

    if (has_slot == "yes") {

        std::string current_slot;

        EXPECT_EQ(fb->GetVar("current-slot", &current_slot), SUCCESS)

        ASSERT_EQ(fb->GetVar("current-slot", &current_slot), SUCCESS)

                << "getvar current-slot failed";

        is_logical_cmd = "is-logical:system_" + current_slot;

    } else {

        is_logical_cmd = "is-logical:system";

        std::string slot_suffix = "_" + current_slot;

        is_logical_cmd_system += slot_suffix;

        is_logical_cmd_vendor += slot_suffix;

        is_logical_cmd_boot += slot_suffix;

    }

    std::string is_logical;

    EXPECT_EQ(fb->GetVar(is_logical_cmd, &is_logical), SUCCESS) << "getvar is-logical failed";

    ASSERT_EQ(is_logical, "yes");

    EXPECT_EQ(fb->GetVar(is_logical_cmd_system, &is_logical), SUCCESS)

            << "system must be a logical partition";

    EXPECT_EQ(is_logical, "yes");

    EXPECT_EQ(fb->GetVar(is_logical_cmd_vendor, &is_logical), SUCCESS)

            << "vendor must be a logical partition";

    EXPECT_EQ(is_logical, "yes");

    EXPECT_EQ(fb->GetVar(is_logical_cmd_boot, &is_logical), SUCCESS)

            << "boot must not be logical partition";

    EXPECT_EQ(is_logical, "no");

}



TEST_F(LogicalPartitionCompliance, FastbootRebootTest) {