Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581

am: 1d33e0815d

Change-Id: I93c7c3e0d66c4e7d59b1d97552036026cb15f96a

common.h

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

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

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