tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Remove EXPAND/STRINGIFY macros."

Browse source 
This reverts commit ec9706738f.

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
This commit is contained in:
Tao Bao 2017-05-04 00:29:31 +00:00
parent ec9706738f
commit 8be0f39fec
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common.h
View file

@ -22,8 +22,8 @@
#include <string> #include <string>
static constexpr int kRecoveryApiVersion = RECOVERY_API_VERSION; // Defined in Android.mk. #define STRINGIFY(x) #x
static_assert(kRecoveryApiVersion >= 3, "Invalid recovery API version."); #define EXPAND(x) STRINGIFY(x)
class RecoveryUI; class RecoveryUI;

2
install.cpp
View file

@ -287,7 +287,7 @@ int update_binary_command(const std::string& path, ZipArchiveHandle zip, int ret
*cmd = { *cmd = {
binary, binary,
std::to_string(kRecoveryApiVersion), EXPAND(RECOVERY_API_VERSION), // defined in Android.mk
std::to_string(status_fd), std::to_string(status_fd),
path, path,
}; };

2
recovery.cpp
View file

@ -1501,7 +1501,7 @@ int main(int argc, char **argv) {
property_list(print_property, NULL); property_list(print_property, NULL);
printf("\n"); printf("\n");
ui->Print("Supported API: %d\n", kRecoveryApiVersion); ui->Print("Supported API: %d\n", RECOVERY_API_VERSION);
int status = INSTALL_SUCCESS; int status = INSTALL_SUCCESS;