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 /install.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 'install.cpp')
-rw-r--r--install.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/install.cpp b/install.cpp
index 689f4a0c..2cc06603 100644
--- a/install.cpp
+++ b/install.cpp
@@ -287,7 +287,7 @@ int update_binary_command(const std::string& path, ZipArchiveHandle zip, int ret
287 287
288 *cmd = { 288 *cmd = {
289 binary, 289 binary,
290 EXPAND(RECOVERY_API_VERSION), // defined in Android.mk 290 std::to_string(kRecoveryApiVersion),
291 std::to_string(status_fd), 291 std::to_string(status_fd),
292 path, 292 path,
293 }; 293 };