From 8be0f39fec7f26164fd0791ff6d15bde65fc849c Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Thu, 4 May 2017 00:29:31 +0000
Subject: [PATCH] Revert "Remove EXPAND/STRINGIFY macros."

This reverts commit ec9706738f35a859f66fd0758b73381055804f63.

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
---
 common.h     | 4 ++--
 install.cpp  | 2 +-
 recovery.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common.h b/common.h
index 87b84772..62fb1324 100644
--- a/common.h
+++ b/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;
 
diff --git a/install.cpp b/install.cpp
index 2cc06603..689f4a0c 100644
--- a/install.cpp
+++ b/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,
   };
diff --git a/recovery.cpp b/recovery.cpp
index 6dd98583..944c2408 100644
--- a/recovery.cpp
+++ b/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;