diff options
| author | Kenny Root <kroot@google.com> | 2015-04-24 22:13:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 22:13:26 +0000 |
| commit | 22335a9730d80c7282f2a10d617136702850c56f (patch) | |
| tree | be187df10b3e4afc4254c6b471b69f972b51f294 /tools/obbtool | |
| parent | 96778220979cc0029d6f8bba98ca87b5dadeda12 (diff) | |
| parent | 6c1af7ea497b1a2f04bdf45a19d2147f5b9665b9 (diff) | |
| download | frameworks_base-22335a9730d80c7282f2a10d617136702850c56f.zip frameworks_base-22335a9730d80c7282f2a10d617136702850c56f.tar.gz frameworks_base-22335a9730d80c7282f2a10d617136702850c56f.tar.bz2 | |
am 6c1af7ea: am 8652bce1: am c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '6c1af7ea497b1a2f04bdf45a19d2147f5b9665b9':
frameworks/base: switch to using NativeConstants.
Diffstat (limited to 'tools/obbtool')
| -rw-r--r-- | tools/obbtool/pbkdf2gen.cpp | 1 |
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> |