nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset 003838e8d110 (bug 1482330) for Adnroid build bustages on mozalloc_abort.cpp CLOSED TREE

Browse source
This commit is contained in:
Bogdan Tara 2018-08-11 03:22:58 +03:00
parent b6dabcd8c5
commit 347da2ba78
4 changed files with 4 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
build/moz.configure/android-ndk.configure
View file

@ -20,7 +20,7 @@ def min_android_version(target):
if target.cpu in ['aarch64', 'x86_64', 'mips64']: if target.cpu in ['aarch64', 'x86_64', 'mips64']:
# 64-bit support was added in API 21. # 64-bit support was added in API 21.
return '21' return '21'
return '16' return '9'
js_option('--with-android-version', js_option('--with-android-version',

2
mobile/android/config/mozconfigs/android-x86/debug
View file

@ -9,7 +9,7 @@ ac_add_options --enable-debug
# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482. # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
# If you think you can't handle the whole set of changes, please reach out to the Release # If you think you can't handle the whole set of changes, please reach out to the Release
# Engineering team. # Engineering team.
ac_add_options --target=i686-linux-android ac_add_options --target=i386-linux-android
ac_add_options --with-android-min-sdk=16 ac_add_options --with-android-min-sdk=16
export MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1

2
mobile/android/config/mozconfigs/android-x86/nightly
View file

@ -5,7 +5,7 @@
# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482. # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
# If you think you can't handle the whole set of changes, please reach out to the Release # If you think you can't handle the whole set of changes, please reach out to the Release
# Engineering team. # Engineering team.
ac_add_options --target=i686-linux-android ac_add_options --target=i386-linux-android
ac_add_options --with-android-min-sdk=16 ac_add_options --with-android-min-sdk=16
ac_add_options --with-branding=mobile/android/branding/nightly ac_add_options --with-branding=mobile/android/branding/nightly

2
python/mozboot/mozboot/android.py
View file

@ -14,7 +14,7 @@ import sys
# We need the NDK version in multiple different places, and it's inconvenient # We need the NDK version in multiple different places, and it's inconvenient
# to pass down the NDK version to all relevant places, so we have this global # to pass down the NDK version to all relevant places, so we have this global
# variable. # variable.
NDK_VERSION = 'r17b' NDK_VERSION = 'r15c'
ANDROID_NDK_EXISTS = ''' ANDROID_NDK_EXISTS = '''
Looks like you have the Android NDK installed at: Looks like you have the Android NDK installed at: