Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1737195 - Allow GV artifact build on Windows workstation again. r=nalexander

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D129233
This commit is contained in:
Makoto Kato 2021-10-25 03:16:58 +00:00
parent 8ec610cce9
commit 1fa2081068
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,8 @@ LINUX_ARM_ANDROID_AVD = "linux64-android-avd-arm-repack"
MACOS_X86_64_ANDROID_AVD = "linux64-android-avd-x86_64-repack"
MACOS_ARM_ANDROID_AVD = "linux64-android-avd-arm-repack"
# We don't currently support bootstrapping on Windows yet.
# WINDOWS_X86_64_ANDROID_AVD = "linux64-android-avd-x86_64-repack"
# WINDOWS_ARM_ANDROID_AVD = "linux64-android-avd-arm-repack"
WINDOWS_X86_64_ANDROID_AVD = "linux64-android-avd-x86_64-repack"
WINDOWS_ARM_ANDROID_AVD = "linux64-android-avd-arm-repack"
AVD_MANIFEST_X86_64 = os.path.abspath(
os.path.join(os.path.dirname(__file__), "android-avds/x86_64.json")

27
python/mozboot/mozboot/mozillabuild.py
View File

@ -160,6 +160,33 @@ class MozillaBuildBootstrapper(BaseBootstrapper):
android.ensure_android(
"windows", artifact_mode=artifact_mode, no_interactive=self.no_interactive
)
android.ensure_android(
"windows",
system_images_only=True,
artifact_mode=artifact_mode,
no_interactive=self.no_interactive,
avd_manifest_path=android.AVD_MANIFEST_X86_64,
)
android.ensure_android(
"windows",
system_images_only=True,
artifact_mode=artifact_mode,
no_interactive=self.no_interactive,
avd_manifest_path=android.AVD_MANIFEST_ARM,
)
def ensure_mobile_android_packages(self, state_dir, checkout_root):
from mozboot import android
self.install_toolchain_artifact(
state_dir, checkout_root, android.WINDOWS_X86_64_ANDROID_AVD
)
self.install_toolchain_artifact(
state_dir, checkout_root, android.WINDOWS_ARM_ANDROID_AVD
)
def install_mobile_android_artifact_mode_packages(self, mozconfig_builder):
self.install_mobile_android_packages(mozconfig_builder, artifact_mode=True)
def generate_mobile_android_mozconfig(self, artifact_mode=False):
from mozboot import android

2
settings.gradle
View File

@ -11,7 +11,7 @@ if (System.properties['os.name'].toLowerCase().contains('windows')) {
if (System.env.MOZILLABUILD) {
def mozillabuild = System.env.MOZILLABUILD
if (mozillabuild) {
commandLine.addAll(0, ["${mozillabuild}/python/python.exe"])
commandLine.addAll(0, ["${mozillabuild}/python3/python.exe"])
}
}
}