From ccb86b45e9115ae417b33f5a71e2f64659791990 Mon Sep 17 00:00:00 2001 From: Jeremy Lakeman Date: Thu, 3 Nov 2011 11:23:19 +1030 Subject: [PATCH] Tidy up build process --- .gitignore | 29 +++++++++++++++++++++++++++++ nacl-jni-prep | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 35b7fcc4..37bcab65 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,32 @@ *.o *.suo dna +/nacl-source +nacl-sources.list +nacl-source.tar +api.h +crypto_auth_hmacsha256.h +crypto_auth_hmacsha512256.h +crypto_box_curve25519xsalsa20poly1305.h +crypto_core_hsalsa20.h +crypto_core_salsa20.h +crypto_core_salsa2012.h +crypto_core_salsa208.h +crypto_hash_sha256.h +crypto_hash_sha512.h +crypto_hashblocks_sha256.h +crypto_hashblocks_sha512.h +crypto_onetimeauth_poly1305.h +crypto_scalarmult_curve25519.h +crypto_secretbox_xsalsa20poly1305.h +crypto_sign_edwards25519sha512batch.h +crypto_stream_salsa20.h +crypto_stream_salsa2012.h +crypto_stream_salsa208.h +crypto_stream_xsalsa20.h +crypto_uint32.h +crypto_verify_16.h +crypto_verify_32.h +nacl.h +randombytes.h + diff --git a/nacl-jni-prep b/nacl-jni-prep index e20d92eb..cb97de78 100755 --- a/nacl-jni-prep +++ b/nacl-jni-prep @@ -29,5 +29,5 @@ echo `ls -1 nacl-source/*/nacl-source/*/*.c` >>nacl-sources.list # Now build Android.mk with the extra .c files listed sources=`echo nacl-source/*/nacl-source/*/*.c` echo sed -e 's,LOCAL_SRC_FILES:= \\,LOCAL_SRC_FILES:= '"${sources}"' \\,' -cat Android-without-nacl.mk | sed -e 's,LOCAL_SRC_FILES:= \\,LOCAL_SRC_FILES:= '"${sources}"' \\,' > Android.mk +cat Android-without-NaCl.mk | sed -e 's,LOCAL_SRC_FILES:= \\,LOCAL_SRC_FILES:= '"${sources}"' \\,' > Android.mk