PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 1d33e0815d

Change-Id: I93c7c3e0d66c4e7d59b1d97552036026cb15f96a
This commit is contained in:
Tao Bao
2017-05-04 00:46:41 +00:00
committed by android-build-merger
parent 6bea344d7e 1d33e0815d
commit a51e44cef7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.h
+2 -2
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;
install.cpp
+1 -1
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,
}; };
recovery.cpp
+1 -1
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;