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

Commit 8be0f39f authored by Tao Bao's avatar Tao Bao
Browse files

Revert "Remove EXPAND/STRINGIFY macros." 

This reverts commit ec970673.

Reason for revert: It's not a good idea to put RECOVERY_API_VERSION in
common.h, which might be included by device-specific codes (but with
RECOVERY_API_VERSION undefined).

Change-Id: I9feb9c64a5af3e9165164622a59b043aa28a8b8c
parent ec970673

common.h

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


#include <string>



static constexpr int kRecoveryApiVersion = RECOVERY_API_VERSION;  // Defined in Android.mk.

static_assert(kRecoveryApiVersion >= 3, "Invalid recovery API version.");

#define STRINGIFY(x) #x

#define EXPAND(x) STRINGIFY(x)



class RecoveryUI;

install.cpp

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


  *cmd = {

    binary,

    std::to_string(kRecoveryApiVersion),

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

    std::to_string(status_fd),

    path,

  };

recovery.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1501,7 +1501,7 @@ int main(int argc, char **argv) { 
    property_list(print_property, NULL);

    printf("\n");



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

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



    int status = INSTALL_SUCCESS;