summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-04-24 21:49:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-24 21:49:47 +0000
commit8652bce13765fb29329df2a4ccca4591bae28de5 (patch)
treefdae4663de336f94d36a44e89b728440569cbe95 /tools
parentb068ae143df2c2f3030da23d7fc130f735975867 (diff)
parentc71f264847eb75d53c0f99e6e1c42a8a1527d3b4 (diff)
downloadframeworks_base-8652bce13765fb29329df2a4ccca4591bae28de5.zip
frameworks_base-8652bce13765fb29329df2a4ccca4591bae28de5.tar.gz
frameworks_base-8652bce13765fb29329df2a4ccca4591bae28de5.tar.bz2
am c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit 'c71f264847eb75d53c0f99e6e1c42a8a1527d3b4': frameworks/base: switch to using NativeConstants.
Diffstat (limited to 'tools')
-rw-r--r--tools/obbtool/pbkdf2gen.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/obbtool/pbkdf2gen.cpp b/tools/obbtool/pbkdf2gen.cpp
index 98d67c0..f1d8d04 100644
--- a/tools/obbtool/pbkdf2gen.cpp
+++ b/tools/obbtool/pbkdf2gen.cpp
@@ -20,6 +20,7 @@
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>