fix(./make): chdir before signing for Android (#339)
More cleanup after https://github.com/ooni/probe/issues/1466
This commit is contained in:
parent
2c0cef4b1a
commit
ad73fef757
20
make
20
make
|
@ -256,7 +256,7 @@ The third form of the command prints this help screen.
|
||||||
|
|
||||||
def _print_target(self, target: Target, indent: int) -> None:
|
def _print_target(self, target: Target, indent: int) -> None:
|
||||||
sys.stdout.write(
|
sys.stdout.write(
|
||||||
'{}{}{}\n'.format(
|
"{}{}{}\n".format(
|
||||||
" " * indent, target.name(), ":" if target.deps() else ""
|
" " * indent, target.name(), ":" if target.deps() else ""
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -468,6 +468,23 @@ class AugmentedPath(Environ):
|
||||||
super().__init__(engine, "PATH", value)
|
super().__init__(engine, "PATH", value)
|
||||||
|
|
||||||
|
|
||||||
|
class WorkingDir:
|
||||||
|
"""WorkingDir is a context manager that enters into a given working
|
||||||
|
directory and returns to the previous directory when done."""
|
||||||
|
|
||||||
|
def __init__(self, dirpath: str) -> None:
|
||||||
|
self._dirpath = dirpath
|
||||||
|
self._prev: str = ""
|
||||||
|
|
||||||
|
def __enter__(self) -> None:
|
||||||
|
self._prev = os.getcwd()
|
||||||
|
os.chdir(self._dirpath)
|
||||||
|
|
||||||
|
def __exit__(self, type: Any, value: Any, traceback: Any) -> bool:
|
||||||
|
os.chdir(self._prev)
|
||||||
|
return False # propagate exc
|
||||||
|
|
||||||
|
|
||||||
class Target(Protocol):
|
class Target(Protocol):
|
||||||
"""Target is a target to build."""
|
"""Target is a target to build."""
|
||||||
|
|
||||||
|
@ -853,6 +870,7 @@ class BundleJAR(BaseTarget):
|
||||||
"oonimkall-{}.pom".format(version),
|
"oonimkall-{}.pom".format(version),
|
||||||
)
|
)
|
||||||
allnames: List[str] = []
|
allnames: List[str] = []
|
||||||
|
with WorkingDir(os.path.join(".", "MOBILE", "android")):
|
||||||
for name in names:
|
for name in names:
|
||||||
allnames.append(name)
|
allnames.append(name)
|
||||||
allnames.append(sign(engine, name))
|
allnames.append(sign(engine, name))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user