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

Commit 6e7df82c authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge "Remove EXPAND/STRINGIFY macros."

parents 64307daf bd0ddcd5

common.h

+3 −2
Original line number Diff line number Diff line
@@ -22,8 +22,9 @@ 


#include <string>



#define STRINGIFY(x) #x

#define EXPAND(x) STRINGIFY(x)

// Not using the command-line defined macro here because this header could be included by

// device-specific recovery libraries. We static assert the value consistency in recovery.cpp.

static constexpr int kRecoveryApiVersion = 3;



class RecoveryUI;

install.cpp

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ int update_binary_command(const std::string& package, ZipArchiveHandle zip, 


  *cmd = {

    binary_path,

    EXPAND(RECOVERY_API_VERSION),  // defined in Android.mk

    std::to_string(kRecoveryApiVersion),

    std::to_string(status_fd),

    package,

  };

recovery.cpp

+5 −1
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ static const int BATTERY_WITH_CHARGER_OK_PERCENTAGE = 15; 
static constexpr const char* RECOVERY_WIPE = "/etc/recovery.wipe";

static constexpr const char* DEFAULT_LOCALE = "en-US";



// We define RECOVERY_API_VERSION in Android.mk, which will be picked up by build system and packed

// into target_files.zip. Assert the version defined in code and in Android.mk are consistent.

static_assert(kRecoveryApiVersion == RECOVERY_API_VERSION, "Mismatching recovery API versions.");



static std::string locale;

static bool has_cache = false;
@@ -1498,7 +1502,7 @@ int main(int argc, char **argv) { 
    property_list(print_property, NULL);

    printf("\n");



    ui->Print("Supported API: %d\n", RECOVERY_API_VERSION);

    ui->Print("Supported API: %d\n", kRecoveryApiVersion);



    int status = INSTALL_SUCCESS;