| Index: import_from_android.sh
|
| diff --git a/import_from_android.sh b/import_from_android.sh
|
| index 7dbdda6527d07527404dada2fdb714e8e2fb4f26..60420d841d40badc5212c0a371d0ff9a0530ebc3 100755
|
| --- a/import_from_android.sh
|
| +++ b/import_from_android.sh
|
| @@ -404,7 +404,7 @@ generate_gyp_file () {
|
| echo "# See 'import_from_android.sh --help' for details."
|
|
|
| local ALL_PREFIXES="OPENSSL_CRYPTO OPENSSL_SSL"
|
| - local ALL_ARCHS="arm mips x86 x86_64"
|
| + local ALL_ARCHS="arm mips x86 x86_64 mac_ia32"
|
| local PREFIX ARCH LIST
|
|
|
| print_gyp "{"
|
| @@ -464,6 +464,15 @@ sed \
|
| $PROGDIR/openssl/include/openssl/opensslconf.h \
|
| > $PROGDIR/config/x64/openssl/opensslconf.h
|
|
|
| +dump "Generating OS X 32-bit configuration header file."
|
| +mkdir -p $PROGDIR/config/mac/ia32/openssl/
|
| +sed \
|
| + -e '4a#ifndef OPENSSL_SYSNAME_MACOSX\n# define OPENSSL_SYSNAME_MACOSX\n#endif' \
|
| + -e 's|^#define RC4_INT unsigned char|#define RC4_INT unsigned int|g' \
|
| + -e 's|^#define DES_LONG unsigned int|#define DES_LONG unsigned long|g' \
|
| + $PROGDIR/openssl/include/openssl/opensslconf.h \
|
| + > $PROGDIR/config/mac/ia32/openssl/opensslconf.h
|
| +
|
| dump "Generating .gypi file."
|
| . $ANDROID_SRC_DIR/openssl.config
|
| generate_gyp_file > $PROGDIR/openssl.gypi.new
|
|
|