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

Commit 5f8d2932 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Remove EXPAND/STRINGIFY macros." am: b00c66fa 

am: 3642b990

Change-Id: I28a2be565c74a051c8b5e7a5633455eb86483a3d
parents 7a1c2943 3642b990

common.h

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


#include <string>



#define STRINGIFY(x) #x

#define EXPAND(x) STRINGIFY(x)

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

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



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,

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

    std::to_string(kRecoveryApiVersion),

    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", RECOVERY_API_VERSION);

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



    int status = INSTALL_SUCCESS;