Closed
Bug 1384199
Opened 7 years ago
Closed 7 years ago
|mach bootstrap| for Android no longer installs Android NDK
Categories
(Firefox Build System :: General, defect)
Firefox Build System
General
Tracking
(firefox56 fixed)
RESOLVED
FIXED
mozilla56
Tracking | Status | |
---|---|---|
firefox56 | --- | fixed |
People
(Reporter: nalexander, Assigned: nalexander)
References
Details
Attachments
(2 files)
I made an error while addressing Bug 1344244, leading to the NDK no longer being installed (into the correct location). This impacts non-artifact bootstrap users: those choosing "mobile_android" rather than "mobile_android_artifact_mode". The Android SDK archive used to include a top-level android-sdk-$OS_NAME directory; it no longer does so. I joined the -$OS_NAME to the toplevel ~/.mozbuild path used for both the SDK and the NDK, resulting in the NDK being in the wrong place.
Comment hidden (mozreview-request) |
Comment hidden (mozreview-request) |
Comment 3•7 years ago
|
||
mozreview-review |
Comment on attachment 8889983 [details] Bug 1384199 - Pre: Remove unused messages and print statements. https://reviewboard.mozilla.org/r/161040/#review166388 Looks like these aren't imported anywhere else.
Attachment #8889983 -
Flags: review?(giles) → review+
Comment 4•7 years ago
|
||
mozreview-review |
Comment on attachment 8889984 [details] Bug 1384199 - Fix path issue in Android bootstrap. https://reviewboard.mozilla.org/r/161042/#review166390 ::: python/mozboot/mozboot/android.py:176 (Diff revision 1) > > > -def ensure_android_sdk_and_ndk(path, sdk_path, sdk_url, ndk_path, ndk_url, artifact_mode): > +def ensure_android_sdk_and_ndk(mozbuild_path, os_name, sdk_path, sdk_url, ndk_path, ndk_url, artifact_mode): > ''' > Ensure the Android SDK and NDK are found at the given paths. If not, fetch > - and unpack the SDK and/or NDK from the given URLs into |path|. > + and unpack the SDK and/or NDK from the given URLs into |mozbuild_path/{android-sdk-$OS_NAME,android-ndk-r11c}|. `android-ndk-$ver` ::: python/mozboot/mozboot/android.py:187 (Diff revision 1) > # Check for Android NDK only if we are not in artifact mode. > if not artifact_mode: > if os.path.isdir(ndk_path): > print(ANDROID_NDK_EXISTS % ndk_path) > else: > - install_mobile_android_sdk_or_ndk(ndk_url, path) > + # The NDK archive unpacks into a top-level android-ndk-r11c directory. Please make the version number in the comment generic so we only have to update the default version in one place.
Attachment #8889984 -
Flags: review?(giles) → review+
Assignee | ||
Comment 5•7 years ago
|
||
mozreview-review |
Comment on attachment 8889984 [details] Bug 1384199 - Fix path issue in Android bootstrap. https://reviewboard.mozilla.org/r/161042/#review166434 ::: python/mozboot/mozboot/android.py:176 (Diff revision 1) > > > -def ensure_android_sdk_and_ndk(path, sdk_path, sdk_url, ndk_path, ndk_url, artifact_mode): > +def ensure_android_sdk_and_ndk(mozbuild_path, os_name, sdk_path, sdk_url, ndk_path, ndk_url, artifact_mode): > ''' > Ensure the Android SDK and NDK are found at the given paths. If not, fetch > - and unpack the SDK and/or NDK from the given URLs into |path|. > + and unpack the SDK and/or NDK from the given URLs into |mozbuild_path/{android-sdk-$OS_NAME,android-ndk-r11c}|. Used `-$VER` throughout.
Comment hidden (mozreview-request) |
Pushed by nalexander@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/e551168b7818 Pre: Remove unused messages and print statements. r=rillian https://hg.mozilla.org/integration/autoland/rev/9658d6703c27 Fix path issue in Android bootstrap. r=rillian
Comment 8•7 years ago
|
||
bugherder |
https://hg.mozilla.org/mozilla-central/rev/e551168b7818 https://hg.mozilla.org/mozilla-central/rev/9658d6703c27
Status: ASSIGNED → RESOLVED
Closed: 7 years ago
status-firefox56:
--- → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla56
Updated•6 years ago
|
Product: Core → Firefox Build System
You need to log in
before you can comment on or make changes to this bug.
Description
•