commit 5f8d2932d0a49159ec6aeae0af177656e4fb23e4
author Tao Bao <tbao@google.com> Wed May 03 23:46:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 23:46:37 2017 +0000
tree b5cf7120323a1788c600ae5040bfc8d85e1869d9
parent 7a1c2943ab9c1d695641c274e83daf944bf4ade1
parent 3642b990730349664e64ac5454c6e94c6cbc5eb0

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

Change-Id: I28a2be565c74a051c8b5e7a5633455eb86483a3d

common.h

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

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

recovery.cpp

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