diff --git a/experiment/orchestrator.py b/experiment/orchestrator.py index f0407cc..d905bf0 100644 --- a/experiment/orchestrator.py +++ b/experiment/orchestrator.py @@ -11,7 +11,7 @@ import queue import datetime import traceback -EMULATORS = [f"root34-{i}" for i in range(20)] +EMULATORS = [f"root34-{i}" for i in range(1)] ANDROID_IMG = "system-images;android-34;default;x86_64" TIMEOUT = 400 @@ -244,7 +244,7 @@ def worker(emu: str, apklist: queue.Queue[str], out_folder: Path, script: Path): marked_done = False try: while True: - apk = apklist.get() + apk = apklist.get(timeout=20) marked_done = False folder_name = apk.split("/")[-1].removesuffix(".apk") folder = out_folder / folder_name diff --git a/experiment/run_dyn_analysis.sh b/experiment/run_dyn_analysis.sh index 399c26f..cba25bb 100644 --- a/experiment/run_dyn_analysis.sh +++ b/experiment/run_dyn_analysis.sh @@ -24,8 +24,8 @@ TMP_DIR=$(mktemp -d) python3 -m venv "${FOLDER}/venv" -"${FOLDER}/venv/bin/pip" install "${FOLDER}/../frida" -"${FOLDER}/venv/bin/pip" install "git+ssh://git@gitlab.inria.fr/CIDRE/malware/grodd-runner.git" +#"${FOLDER}/venv/bin/pip" install "${FOLDER}/../frida" +#"${FOLDER}/venv/bin/pip" install "git+ssh://git@gitlab.inria.fr/CIDRE/malware/grodd-runner.git" ls "${APK_DIR}"/*.apk > "${TMP_DIR}/apklist.txt"