aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-05-03 13:00:48 -0500
committerTao Bao2017-05-03 13:26:00 -0500
commitec9706738f35a859f66fd0758b73381055804f63 (patch)
tree1a3293313d04f5f9e7432ee5d13344b22a3fbefd /recovery.cpp
parent89394632b1241f6f4ef9399e3f6fe7d2cc2eaf15 (diff)
downloadplatform-bootable-recovery-ec9706738f35a859f66fd0758b73381055804f63.tar.gz
platform-bootable-recovery-ec9706738f35a859f66fd0758b73381055804f63.tar.xz
platform-bootable-recovery-ec9706738f35a859f66fd0758b73381055804f63.zip
Remove EXPAND/STRINGIFY macros.
They are error-prone by putting anything into a string (e.g. EXPAND(RECOVERY_API_VERSION) would become "RECOVER_API_VERSION" if we forgot to pass -DRECOVERY_API_VERSION=3). RECOVERY_API_VERSION is the only user (in bootable/recovery) that gets stringified. Assign it to a typed var and sanity check the value. Don't see other reference to the macros from device-specific recovery directories (they can still define that locally if really needed). Test: recovery_component_test Test: Sideload an OTA on angler and marlin respectively. Change-Id: I358bbdf8f0a99db5ce4c7bc2fdcafe8013501b64
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 944c2408..6dd98583 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1501,7 +1501,7 @@ int main(int argc, char **argv) {
1501 property_list(print_property, NULL); 1501 property_list(print_property, NULL);
1502 printf("\n"); 1502 printf("\n");
1503 1503
1504 ui->Print("Supported API: %d\n", RECOVERY_API_VERSION); 1504 ui->Print("Supported API: %d\n", kRecoveryApiVersion);
1505 1505
1506 int status = INSTALL_SUCCESS; 1506 int status = INSTALL_SUCCESS;
1507 1507