diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-16 18:14:37 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-16 18:14:37 -0500 |
commit | 0ab2c3f8a37631bda574abf15afcb17e4d1ebf08 (patch) | |
tree | c72df7aa9ba8c68a0685e9cde4c66a2172429157 | |
parent | 1517298820bcb965e2ce7d76aabdf736d1590582 (diff) | |
parent | 971bda7b10f5b02ad9fcf947778416f9217e4950 (diff) | |
download | servo-0ab2c3f8a37631bda574abf15afcb17e4d1ebf08.tar.gz servo-0ab2c3f8a37631bda574abf15afcb17e4d1ebf08.zip |
Auto merge of #22196 - paulrouget:ndkfilter, r=Manishearth
Add only one architecture per apk
Fix #22192
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22196)
<!-- Reviewable:end -->
-rw-r--r-- | support/android/apk/servoapp/build.gradle | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/support/android/apk/servoapp/build.gradle b/support/android/apk/servoapp/build.gradle index a51576c6f62..424148a6fa0 100644 --- a/support/android/apk/servoapp/build.gradle +++ b/support/android/apk/servoapp/build.gradle @@ -65,28 +65,52 @@ android { // Custom build types armDebug { initWith(debug) + ndk { + abiFilters getNDKAbi('arm') + } } armRelease { initWith(release) + ndk { + abiFilters getNDKAbi('arm') + } } armv7Debug { initWith(debug) + ndk { + abiFilters getNDKAbi('armv7') + } } armv7Release { initWith(release) + ndk { + abiFilters getNDKAbi('armv7') + } } arm64Debug { initWith(debug) + ndk { + abiFilters getNDKAbi('arm64') + } } arm64Release { initWith(release) + ndk { + abiFilters getNDKAbi('arm64') + } } x86Debug { initWith(debug) + ndk { + abiFilters getNDKAbi('x86') + } } x86Release { initWith(release) + ndk { + abiFilters getNDKAbi('x86') + } } } |