Skip to content

Support mach install for b2g. #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brendandahl wants to merge 1 commit into
base: gonk
Choose a base branch
from
Open

Support mach install for b2g. #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions b2g/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ package:
@$(MAKE) -C b2g/installer

install::
@echo 'B2G can't be installed directly.'
@exit 1
@adb shell stop b2g
@adb remount
@adb shell rm -rf /system/b2g
@adb push dist/b2g/ /system/b2g
@adb shell start b2g

upload::
@$(MAKE) -C b2g/installer upload
Expand Down
10 changes: 10 additions & 0 deletions python/mozbuild/mozbuild/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,11 +1010,21 @@ def is_b2g_desktop(cls):
(cls.substs.get('MOZ_WIDGET_TOOLKIT') != 'gonk'))
return False

@staticmethod
def is_b2g(cls):
"""Must have a B2G build."""
if hasattr(cls, 'substs'):
return ((cls.substs.get('MOZ_BUILD_APP') == 'b2g') and
(cls.substs.get('MOZ_WIDGET_TOOLKIT') == 'gonk'))
return False


@staticmethod
def has_build(cls):
"""Must have a build."""
return (MachCommandConditions.is_firefox_or_android(cls) or
MachCommandConditions.is_thunderbird(cls) or
MachCommandConditions.is_b2g(cls) or
MachCommandConditions.is_b2g_desktop(cls))

@staticmethod
Expand Down