forked from mirrors/nixpkgs
merge in ewemoa's zipalign fix with my updated build-tools
now passes Android tests found at https://github.com/svanderburg/nix-androidenvtests !
This commit is contained in:
parent
0ede64bfcb
commit
02f5f25b2d
|
@ -40,6 +40,13 @@ stdenv.mkDerivation {
|
|||
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:`pwd` $i
|
||||
done
|
||||
|
||||
# These binaries also need zlib in addition to libstdc++
|
||||
for i in zipalign
|
||||
do
|
||||
patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
|
||||
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
|
||||
done
|
||||
|
||||
# These binaries need to find libstdc++, libgcc_s, and zlib
|
||||
for i in aapt dexdump
|
||||
do
|
||||
|
|
Loading…
Reference in a new issue