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

Commit afce5906 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "fastbootd: exporting CPU ABI info"

parents e40d2b1a 33da5c94

fastboot/constants.h

+1 −0
Original line number Diff line number Diff line
@@ -68,3 +68,4 @@ 
#define FB_VAR_BATTERY_SOC_OK "battery-soc-ok"

#define FB_VAR_SUPER_PARTITION_NAME "super-partition-name"

#define FB_VAR_SNAPSHOT_UPDATE_STATUS "snapshot-update-status"

#define FB_VAR_CPU_ABI "cpu-abi"

fastboot/device/commands.cpp

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ bool GetVarHandler(FastbootDevice* device, const std::vector<std::string>& args) 
            {FB_VAR_BATTERY_SOC_OK, {GetBatterySoCOk, nullptr}},

            {FB_VAR_HW_REVISION, {GetHardwareRevision, nullptr}},

            {FB_VAR_SUPER_PARTITION_NAME, {GetSuperPartitionName, nullptr}},

            {FB_VAR_SNAPSHOT_UPDATE_STATUS, {GetSnapshotUpdateStatus, nullptr}}};

            {FB_VAR_SNAPSHOT_UPDATE_STATUS, {GetSnapshotUpdateStatus, nullptr}},

            {FB_VAR_CPU_ABI, {GetCpuAbi, nullptr}}};



    if (args.size() < 2) {

        return device->WriteFail("Missing argument");

fastboot/device/variables.cpp

+6 −0
Original line number Diff line number Diff line
@@ -458,3 +458,9 @@ bool GetSnapshotUpdateStatus(FastbootDevice* device, const std::vector<std::stri 
    }

    return true;

}



bool GetCpuAbi(FastbootDevice* /* device */, const std::vector<std::string>& /* args */,

               std::string* message) {

    *message = android::base::GetProperty("ro.product.cpu.abi", "");

    return true;

}

fastboot/device/variables.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ bool GetSuperPartitionName(FastbootDevice* device, const std::vector<std::string 
                           std::string* message);

bool GetSnapshotUpdateStatus(FastbootDevice* device, const std::vector<std::string>& args,

                             std::string* message);

bool GetCpuAbi(FastbootDevice* device, const std::vector<std::string>& args, std::string* message);



// Helpers for getvar all.

std::vector<std::vector<std::string>> GetAllPartitionArgsWithSlot(FastbootDevice* device);