Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 am: 3642b99073

am: 5f8d2932d0

Change-Id: Ib13d560262af5b9dbe762a7d7b01831b4791ba2f

common.h

@@ -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

@@ -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

@@ -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;