summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-05-04 01:48:37 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-05-04 01:48:37 +0200
commitdd08a0d4d3d851972613ffe2ac29674d5bdd6f17 (patch)
treec0a3555895dbb4c75144539fc7b3351d2747db16
parentMerge "Add a default error code when updater script aborts" am: 89394632b1 am: 18bb9a4f26 (diff)
parentMerge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 (diff)
downloadandroid_bootable_recovery-dd08a0d4d3d851972613ffe2ac29674d5bdd6f17.tar
android_bootable_recovery-dd08a0d4d3d851972613ffe2ac29674d5bdd6f17.tar.gz
android_bootable_recovery-dd08a0d4d3d851972613ffe2ac29674d5bdd6f17.tar.bz2
android_bootable_recovery-dd08a0d4d3d851972613ffe2ac29674d5bdd6f17.tar.lz
android_bootable_recovery-dd08a0d4d3d851972613ffe2ac29674d5bdd6f17.tar.xz
android_bootable_recovery-dd08a0d4d3d851972613ffe2ac29674d5bdd6f17.tar.zst
android_bootable_recovery-dd08a0d4d3d851972613ffe2ac29674d5bdd6f17.zip
-rw-r--r--common.h4
-rw-r--r--install.cpp2
-rw-r--r--recovery.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/common.h b/common.h
index 62fb1324b..87b84772d 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;
diff --git a/install.cpp b/install.cpp
index 689f4a0c6..2cc06603b 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,
- EXPAND(RECOVERY_API_VERSION), // defined in Android.mk
+ std::to_string(kRecoveryApiVersion),
std::to_string(status_fd),
path,
};
diff --git a/recovery.cpp b/recovery.cpp
index 944c24086..6dd985831 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", RECOVERY_API_VERSION);
+ ui->Print("Supported API: %d\n", kRecoveryApiVersion);
int status = INSTALL_SUCCESS;