Merge branch 'disable_afwall' into 'master'

Diable afwall because of bug in NDK r10e

Currently failing (https://f-droid.org/wiki/page/dev.ukanth.ufirewall/lastbuild_15203) with:

```
internal error in do_print_to_mapfile, at /s/ndk-toolchain/src/build/../binutils/binutils-2.25/gold/output.h:395
```

Downgrading to r10d or using an other linker is solving this according to:

https://f-droid.org/wiki/page/dev.ukanth.ufirewall/lastbuild_15203

See merge request !880
This commit is contained in:
Daniel Martí 2015-07-21 17:00:25 +00:00
commit 4106fdbbf9

View file

@ -277,6 +277,7 @@ Build:2.0.0-ALPHA-2,15201
ndk=r10e ndk=r10e
Build:2.0.0-BETA-1,15203 Build:2.0.0-BETA-1,15203
disable=Bug in NDK r10e
commit=6aae7a1f63bc1dee49080738bbbd3cbec75216aa commit=6aae7a1f63bc1dee49080738bbbd3cbec75216aa
subdir=aFWall subdir=aFWall
scandelete=aFWall/src/main/res/raw/ scandelete=aFWall/src/main/res/raw/