wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1217039 - Created a function android_ndk_url() in android.py and used it in all other sub-modules to calculate the URL. r=mshal

Browse Source
This commit is contained in:
Harshit Bansal 2015-11-15 14:49:08 +01:00
parent 1fe7d9c5ea
commit 5d829f31f4
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/mozboot/mozboot/android.py
View File

@ -235,3 +235,12 @@ def ensure_android_packages(android_tool, packages=None):
def suggest_mozconfig(sdk_path=None, ndk_path=None):
print(MOBILE_ANDROID_MOZCONFIG_TEMPLATE % (sdk_path, ndk_path))
def android_ndk_url(os_name, ver='r10e') :
from sys import maxsize
base_url = 'https://dl.google.com/android/ndk/android-ndk-'
if maxsize > 2**32 :
return (base_url+ver+'-'+os_name+'-x86_64.bin')
else :
return (base_url+ver+'-'+os_name+'-x86.bin')

7
python/mozboot/mozboot/archlinux.py
View File

@ -113,11 +113,8 @@ class ArchlinuxBootstrapper(BaseBootstrapper):
self.sdk_path = os.environ.get('ANDROID_SDK_HOME', os.path.join(mozbuild_path, 'android-sdk-linux'))
self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r10e'))
self.sdk_url = 'https://dl.google.com/android/android-sdk_r24.0.1-linux.tgz'
is_64bits = sys.maxsize > 2**32
if is_64bits:
self.ndk_url = 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin'
else:
self.ndk_url = 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin'
self.ndk_url = android_ndk_url('linux')
android.ensure_android_sdk_and_ndk(path=mozbuild_path,
sdk_path=self.sdk_path, sdk_url=self.sdk_url,
ndk_path=self.ndk_path, ndk_url=self.ndk_url)

7
python/mozboot/mozboot/debian.py
View File

@ -128,11 +128,8 @@ class DebianBootstrapper(BaseBootstrapper):
self.sdk_path = os.environ.get('ANDROID_SDK_HOME', os.path.join(mozbuild_path, 'android-sdk-linux'))
self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r10e'))
self.sdk_url = 'https://dl.google.com/android/android-sdk_r24.0.1-linux.tgz'
is_64bits = sys.maxsize > 2**32
if is_64bits:
self.ndk_url = 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin'
else:
self.ndk_url = 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin'
self.ndk_url = android_ndk_url('linux')
android.ensure_android_sdk_and_ndk(path=mozbuild_path,
sdk_path=self.sdk_path, sdk_url=self.sdk_url,
ndk_path=self.ndk_path, ndk_url=self.ndk_url)

3
python/mozboot/mozboot/osx.py
View File

@ -355,9 +355,10 @@ class OSXBootstrapper(BaseBootstrapper):
self.sdk_url = 'https://dl.google.com/android/android-sdk_r24.0.1-macosx.zip'
is_64bits = sys.maxsize > 2**32
if is_64bits:
self.ndk_url = 'https://dl.google.com/android/ndk/android-ndk-r10e-darwin-x86_64.bin'
self.ndk_url = android_ndk_url('darwin')
else:
raise Exception('You need a 64-bit version of Mac OS X to build Firefox for Android.')
android.ensure_android_sdk_and_ndk(path=mozbuild_path,
sdk_path=self.sdk_path, sdk_url=self.sdk_url,
ndk_path=self.ndk_path, ndk_url=self.ndk_url)