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

Commit 7f6bf505 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c421985 am: 1d33e081 am: a51e44ce 

am: 38577ef1

Change-Id: I55260d77ab0dd2b5eff5010d65305b14111439b0
parents ab1e7064 38577ef1

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;