ndk_patches: Remove sha1.h
authorFredrik Fornwall <fredrik@fornwall.net>
Sun, 8 May 2016 20:08:51 +0000 (16:08 -0400)
committerFredrik Fornwall <fredrik@fornwall.net>
Sun, 8 May 2016 20:08:51 +0000 (16:08 -0400)
build-package.sh
ndk_patches/sha1.h [deleted file]

index 4d51e05..1a10db3 100755 (executable)
@@ -164,10 +164,8 @@ if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
                        patch -p1;
                echo "PATCHING FILE $f done!"
        done
-       # sha1.h was removed from android ndk for platforms above 19, but needed by the aapt package
-       # JNIHelp.h is also used by aapt
-       # sysexits.h is header-only and used by some unix code
-        cp $TERMUX_SCRIPTDIR/ndk_patches/{sha1.h,sysexits.h} $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include
+       # sysexits.h is header-only and used by a few programs:
+        cp $TERMUX_SCRIPTDIR/ndk_patches/sysexits.h $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include
 fi
 
 export TERMUX_COMMON_CACHEDIR="$TERMUX_TOPDIR/_cache"
diff --git a/ndk_patches/sha1.h b/ndk_patches/sha1.h
deleted file mode 100644 (file)
index f7ada46..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*     $NetBSD: sha1.h,v 1.13 2005/12/26 18:41:36 perry Exp $  */
-
-/*
- * SHA-1 in C
- * By Steve Reid <steve@edmweb.com>
- * 100% Public Domain
- */
-
-#ifndef _SYS_SHA1_H_
-#define        _SYS_SHA1_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#define SHA1_DIGEST_LENGTH             20
-#define SHA1_DIGEST_STRING_LENGTH      41
-
-typedef struct {
-       uint32_t state[5];
-       uint32_t count[2];
-       u_char buffer[64];
-} SHA1_CTX;
-
-__BEGIN_DECLS
-void   SHA1Transform(uint32_t[5], const u_char[64]);
-void   SHA1Init(SHA1_CTX *);
-void   SHA1Update(SHA1_CTX *, const u_char *, u_int);
-void   SHA1Final(u_char[SHA1_DIGEST_LENGTH], SHA1_CTX *);
-__END_DECLS
-
-#endif /* _SYS_SHA1_H_ */