commit 1d33e0815d2032de7e4664f398ef7c08e5cfd258
author Tao Bao <tbao@google.com> Thu May 04 00:44:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 04 00:44:10 2017 +0000
tree 75ac66eec7d9d1b88185b9e2de10bb69156270c5
parent 53b98de8660be952384f2b48bf9d649bd62bcce1
parent 7c421985812d866c2c7da1f23ef2539e0f6eee09

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

Change-Id: I89eb2acace8e53a2af00fd681e6298edc157f8ac

common.h

diff --git a/common.h b/common.h
index 87b8477..62fb132 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;
 

install.cpp

diff --git a/install.cpp b/install.cpp
index 2cc0660..689f4a0 100644
--- a/install.cpp
+++ b/install.cpp
@@ -287,7 +287,7 @@
 
   *cmd = {
     binary,
-    std::to_string(kRecoveryApiVersion),
+    EXPAND(RECOVERY_API_VERSION),  // defined in Android.mk
     std::to_string(status_fd),
     path,
   };

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 6dd9858..944c240 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1501,7 +1501,7 @@
     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;