Move scopeguard into android::base
Test: boot bullhead, bionic unit tests
Change-Id: I223249684867655ecb53713b10da41d3014f96ae
diff --git a/tests/utils.h b/tests/utils.h
index fa85545..2e9b994 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -28,10 +28,9 @@
#include <regex>
#include <android-base/file.h>
+#include <android-base/scopeguard.h>
#include <android-base/stringprintf.h>
-#include "private/ScopeGuard.h"
-
#if defined(__LP64__)
#define PATH_TO_SYSTEM_LIB "/system/lib64/"
#else
@@ -68,9 +67,7 @@
return false;
}
- auto fp_guard = make_scope_guard([&]() {
- fclose(fp);
- });
+ auto fp_guard = android::base::make_scope_guard([&]() { fclose(fp); });
char line[BUFSIZ];
while (fgets(line, sizeof(line), fp) != nullptr) {