commit bf41cc4897ed09976fd48b65b0ad94d83bf074cb
author Elliott Hughes <enh@google.com> Wed Jun 29 05:03:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 29 05:03:27 2016 +0000
tree a016eaf0800b4351d293a67d5cf06e120e3d2767
parent bf6f4fe8e7517dfc0fbef3354feb238880b3a841
parent 25d4ebdbc5c62cf9064115837b981a5757530305

Fix build breakage from merge conflict resolution.
am: a5dac1a35b

Change-Id: Ifcf06f6489c26457bee9542082dce62def223ffc

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 9cb61c3..3ae7408 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1090,7 +1090,7 @@
 
     setup_requirements(reinterpret_cast<char*>(data), sz);
 
-    for (size_t i = 0; i < ARRAY_SIZE(images); i++) {
+    for (size_t i = 0; i < arraysize(images); i++) {
         fname = find_item(images[i].part_name, product);
         fastboot_buffer buf;
         if (!load_buf(transport, fname.c_str(), &buf)) {