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 1204260 - Post: remove platforms/android-* from |mach bootstrap|. r=glandium

Browse Source
This commit is contained in:
Nick Alexander 2015-09-22 11:40:06 -07:00
parent fd327d6ecb
commit f85972a10e
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,8 +23,6 @@ ANDROID_PACKAGES = [
'platform-tools',
'build-tools-%s' % ANDROID_BUILD_TOOLS_VERSION,
ANDROID_PLATFORM,
'extra-android-support',
'extra-google-google_play_services',
'extra-google-m2repository',
'extra-android-m2repository',
]

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

@ -144,10 +144,7 @@ class DebianBootstrapper(BaseBootstrapper):
def suggest_mobile_android_mozconfig(self):
import android
# The SDK path that mozconfig wants includes platforms/android-21.
sdk_path = os.path.join(self.sdk_path, 'platforms', android.ANDROID_PLATFORM)
android.suggest_mozconfig(sdk_path=sdk_path,
android.suggest_mozconfig(sdk_path=self.sdk_path,
ndk_path=self.ndk_path)
def _update_package_manager(self):

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

@ -355,7 +355,7 @@ class OSXBootstrapper(BaseBootstrapper):
def suggest_homebrew_mobile_android_mozconfig(self):
import android
# We could probably fish this path from |brew info android-sdk|.
sdk_path = '/usr/local/opt/android-sdk/platforms/%s' % android.ANDROID_PLATFORM
sdk_path = '/usr/local/opt/android-sdk'
ndk_path = '/usr/local/opt/android-ndk'
android.suggest_mozconfig(sdk_path=sdk_path, ndk_path=ndk_path)