diff options
| author | Tao Bao <tbao@google.com> | 2017-05-04 01:43:37 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-04 01:43:37 +0200 |
| commit | 3642b990730349664e64ac5454c6e94c6cbc5eb0 (patch) | |
| tree | 1a3293313d04f5f9e7432ee5d13344b22a3fbefd | |
| parent | Merge "Add a default error code when updater script aborts" (diff) | |
| parent | Merge "Remove EXPAND/STRINGIFY macros." (diff) | |
| download | android_bootable_recovery-3642b990730349664e64ac5454c6e94c6cbc5eb0.tar android_bootable_recovery-3642b990730349664e64ac5454c6e94c6cbc5eb0.tar.gz android_bootable_recovery-3642b990730349664e64ac5454c6e94c6cbc5eb0.tar.bz2 android_bootable_recovery-3642b990730349664e64ac5454c6e94c6cbc5eb0.tar.lz android_bootable_recovery-3642b990730349664e64ac5454c6e94c6cbc5eb0.tar.xz android_bootable_recovery-3642b990730349664e64ac5454c6e94c6cbc5eb0.tar.zst android_bootable_recovery-3642b990730349664e64ac5454c6e94c6cbc5eb0.zip | |
| -rw-r--r-- | common.h | 4 | ||||
| -rw-r--r-- | install.cpp | 2 | ||||
| -rw-r--r-- | recovery.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -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; |