Bug 1204260 - Post: remove platforms/android-* from |mach bootstrap|. r=glandium
authorNick Alexander <nalexander@mozilla.com>
Tue, 22 Sep 2015 11:40:06 -0700
changeset 263981 4d2b605ee1fa22089d105eb405da96b0e1a0cd92
parent 263980 e5ab2152fb0084f4a7737cc830058b10deb19e47
child 263982 9cc48934efe86d5afe250c9bc501bf10a339fc45
push id65484
push usercbook@mozilla.com
push dateWed, 23 Sep 2015 10:47:13 +0000
treeherdermozilla-inbound@88067e5193f0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1204260
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1204260 - Post: remove platforms/android-* from |mach bootstrap|. r=glandium
python/mozboot/mozboot/android.py
python/mozboot/mozboot/debian.py
python/mozboot/mozboot/osx.py
--- a/python/mozboot/mozboot/android.py
+++ b/python/mozboot/mozboot/android.py
@@ -18,18 +18,16 @@ ANDROID_BUILD_TOOLS_VERSION = '22.0.1'
 
 # These are the "Android packages" needed for building Firefox for Android.
 # Use |android list sdk --extended| to see these identifiers.
 ANDROID_PACKAGES = [
     'tools',
     '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',
 ]
 
 ANDROID_NDK_EXISTS = '''
 Looks like you have the Android NDK installed at:
 %s
 '''
--- a/python/mozboot/mozboot/debian.py
+++ b/python/mozboot/mozboot/debian.py
@@ -139,20 +139,17 @@ class DebianBootstrapper(BaseBootstrappe
 
         # 3. We expect the |android| tool to at
         # ~/.mozbuild/android-sdk-linux/tools/android.
         android_tool = os.path.join(self.sdk_path, 'tools', 'android')
         android.ensure_android_packages(android_tool=android_tool)
 
     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):
         self.apt_update()
 
     def upgrade_mercurial(self, current):
         """Install Mercurial from pip because Debian packages typically lag."""
         if self.no_interactive:
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -350,17 +350,17 @@ class OSXBootstrapper(BaseBootstrapper):
 
         # We could probably fish this path from |brew info android-sdk|.
         android_tool = '/usr/local/opt/android-sdk/tools/android'
         android.ensure_android_packages(android_tool)
 
     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)
 
     def _ensure_macports_packages(self, packages):
         self.port = self.which('port')
         assert self.port is not None
 
         installed = set(self.check_output([self.port, 'installed']).split())