mozilla-inbound: changeset 226899:ee25e5277ab6ce76d8cef914bd269d306c8b3cf1

author	Nick Alexander <nalexander@mozilla.com>
	Mon, 26 Jan 2015 11:13:49 -0800
changeset 226899	ee25e5277ab6ce76d8cef914bd269d306c8b3cf1
parent 226898	bb30dc4d6962d4116422043927fedb906473ab8e
child 226900	068b172026ef63d92f2a8607c3f03c81f577568a
push id	54950
push user	philringnalda@gmail.com
push date	Sat, 31 Jan 2015 17:14:09 +0000
treeherder	mozilla-inbound@37cbadfe1bc1 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	me
bugs	1123824
milestone	38.0a1
first release with	nightly linux32 c2359a6a6958 / 38.0a1 / 20150201030209 / files nightly linux64 c2359a6a6958 / 38.0a1 / 20150201030209 / files nightly mac c2359a6a6958 / 38.0a1 / 20150201030209 / files nightly win32 c2359a6a6958 / 38.0a1 / 20150201030209 / files nightly win64 c2359a6a6958 / 38.0a1 / 20150201030209 / files
last release without	nightly linux32 d7e156a7a0a6 / 38.0a1 / 20150131030230 / files nightly linux64 d7e156a7a0a6 / 38.0a1 / 20150131030230 / files nightly mac d7e156a7a0a6 / 38.0a1 / 20150131030230 / files nightly win32 d7e156a7a0a6 / 38.0a1 / 20150131030230 / files nightly win64 d7e156a7a0a6 / 38.0a1 / 20150131030230 / files

--- a/python/mozboot/mozboot/debian.py
+++ b/python/mozboot/mozboot/debian.py
@@ -116,14 +116,16 @@ 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
 
-        android.suggest_mozconfig(sdk_path=self.sdk_path,
+        # 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,
             ndk_path=self.ndk_path)
 
     def _update_package_manager(self):
         self.run_as_root(['apt-get', 'update'])