From ec9706738f35a859f66fd0758b73381055804f63 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Wed, 3 May 2017 11:00:48 -0700
Subject: 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
---
 install.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'install.cpp')

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,
   };
-- 
cgit v1.2.3