factor out references to the android SDK target into an env variable

[ajnirp]

fixes #8348

[Manishearth]

Should we make this a part of .servobuild instead?

[Manishearth]

r? @larsbergstrom

[larsbergstrom]

@bors-servo r+

I think we can factor this out into a setting or argument later. If we end up producing builds for multiple android target versions (as Fennec does today!) we'll need to be able to set it as an argument on the build machines, which don't use .servobuild today.

[bors-servo]

📌 Commit a9929d6 has been approved by larsbergstrom

[bors-servo]

⌛ Testing commit a9929d6 with merge ef1c80c...

[bors-servo]

💔 Test failed - android

[jdm]

make[2]: Entering directory `/home/servo/buildbot/slave/android/build/support/android/openssl-1.0.1k/crypto'
In file included from cryptlib.c:117:0:
cryptlib.h:62:20: fatal error: stdlib.h: No such file or directory
 #include <stdlib.h>
                    ^
compilation terminated.
mem.c:59:19: fatal error: stdio.h: No such file or directory
 #include <stdio.h>
                   ^
compilation terminated.
mem_clr.c:59:20: fatal error: string.h: No such file or directory
 #include <string.h>
                    ^
compilation terminated.
mem_dbg.c:112:19: fatal error: stdio.h: No such file or directory
 #include <stdio.h>
                   ^
compilation terminated.
In file included from cversion.c:59:0:
cryptlib.h:62:20: fatal error: stdlib.h: No such file or directory
 #include <stdlib.h>
                    ^
compilation terminated.
In file included from ex_data.c:141:0:
cryptlib.h:62:20: fatal error: stdlib.h: No such file or directory
 #include <stdlib.h>
                    ^
compilation terminated.
cpt_err.c:61:19: fatal error: stdio.h: No such file or directory
 #include <stdio.h>
                   ^
compilation terminated.
In file included from uid.c:56:0:
../include/openssl/crypto.h:120:20: fatal error: stdlib.h: No such file or directory
 #include <stdlib.h>
                    ^
compilation terminated.
o_time.c:63:20: fatal error: string.h: No such file or directory
 #include <string.h>
                    ^
compilation terminated.
o_str.c:59:19: fatal error: ctype.h: No such file or directory
 #include <ctype.h>
                   ^
compilation terminated.
o_dir.c:59:19: fatal error: errno.h: No such file or directory
 #include <errno.h>
                   ^
compilation terminated.
In file included from o_fips.c:58:0:
cryptlib.h:62:20: fatal error: stdlib.h: No such file or directory
 #include <stdlib.h>
                    ^
compilation terminated.
In file included from o_init.c:55:0:
../e_os.h:451:30: fatal error: unistd.h: No such file or directory
 #      include OPENSSL_UNISTD
                              ^
compilation terminated.
make[2]: *** [depend] Error 1
make[2]: Leaving directory `/home/servo/buildbot/slave/android/build/support/android/openssl-1.0.1k/crypto'
make[1]: *** [depend] Error 1
make[1]: Leaving directory `/home/servo/buildbot/slave/android/build/support/android/openssl-1.0.1k'
make[1]: Entering directory `/home/servo/buildbot/slave/android/build/support/android/openssl-1.0.1k'
making all in crypto...
make[2]: Entering directory `/home/servo/buildbot/slave/android/build/support/android/openssl-1.0.1k/crypto'
arm-linux-androideabi-gcc -I. -I.. -I../include  -fPIC -DOPENSSL_PIC -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -Wa,--noexecstack -march=armv7-a -mandroid -I/home/servo/android-ndk-r10c//platforms//arch-arm/usr/include -B/home/servo/android-ndk-r10c//platforms//arch-arm/usr/lib -O3 -fomit-frame-pointer -Wall -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DAES_ASM -DGHASH_ASM   -c -o cryptlib.o cryptlib.c
In file included from cryptlib.c:117:0:
cryptlib.h:62:20: fatal error: stdlib.h: No such file or directory
 #include <stdlib.h>
                    ^
compilation terminated.
make[2]: *** [cryptlib.o] Error 1
make[2]: Leaving directory `/home/servo/buildbot/slave/android/build/support/android/openssl-1.0.1k/crypto'
make[1]: *** [build_crypto] Error 1
make[1]: Leaving directory `/home/servo/buildbot/slave/android/build/support/android/openssl-1.0.1k'
make: *** [openssl-1.0.1k/libssl.so] Error 2

[ajnirp]

@jdm I'm unable to repro this. How do I do so?

[jdm]

Maybe @larsbergstrom has an idea?

[larsbergstrom]

I will try this locally and see if I can repro it! Sorry for the delay.

[larsbergstrom]

Very strange! ./mach build --android -d && ./mach package -d worked for me, too. I'll have to try it on the builder.

[larsbergstrom]

This does not repro on the builder, either, with this branch and an identical environment. I'd like to give this a retry, in case it's something related to our often-flaky OpenSSL build process (we download and extract a tarball, and it frequently causes issues).

@bors-servo retry

[bors-servo]

⌛ Testing commit a9929d6 with merge 9c0951d...

[bors-servo]

💔 Test failed - android

[larsbergstrom]

Well, at least it's reproducible! I'll try to repro harder :-)

[larsbergstrom]

Ha! Managed to repro it. Need to git clean -fdx because the problem is that if you've already d/l'd and built openssl, even a ./mach clean won't get rid of it. The directory is support/android/openssl-1.0.1k.

Let me know if you'd like me to help with tracking down the issue, and sorry it took me so long to figure out how to repro! I totally forgot that we build openssl in-tree. I should open issues for us to move our in-tree builds to the target directory...

[larsbergstrom]

@wenderen Do you need any assistance with this PR?

[jdm]

Closing due to lack of updates.