commit 7de1ff2ad63aedda5096d5ee64203703dbdecf17
author Elliott Hughes <enh@google.com> Tue Mar 22 20:27:39 2016 -0700
committer Elliott Hughes <enh@google.com> Tue Mar 22 20:27:39 2016 -0700
tree 734822ad30c69306319b200c5f621a424d96fbdc
parent 68a2f12304e960f2045f3819c48311e7bf4d3126

Move relocation_packer off libnativehelper.

Also remove other bits of makefile cruft.

Change-Id: I8b69822200959368003a8af9d1595bea9182d6d8

tools/relocation_packer/src/main.cc

diff --git a/tools/relocation_packer/src/main.cc b/tools/relocation_packer/src/main.cc
index 8e9de6d..d0a0dd4 100644
--- a/tools/relocation_packer/src/main.cc
+++ b/tools/relocation_packer/src/main.cc
@@ -25,7 +25,7 @@
 #include "elf_traits.h"
 #include "libelf.h"
 
-#include "nativehelper/ScopedFd.h"
+#include <android-base/unique_fd.h>
 
 static void PrintUsage(const char* argv0) {
   std::string temporary = argv0;
@@ -94,7 +94,7 @@
   }
 
   const char* file = argv[argc - 1];
-  ScopedFd fd(open(file, O_RDWR));
+  android::base::unique_fd fd(open(file, O_RDWR));
   if (fd.get() == -1) {
     LOG(ERROR) << file << ": " << strerror(errno);
     return 1;