From 649985a530c39afcda23d1f188fa2fc92df3ac56 Mon Sep 17 00:00:00 2001 From: mtklein Date: Tue, 13 Sep 2016 11:17:58 -0700 Subject: [PATCH] Remove clear /data/local/tmp steps. These were intended to prevent GN and GYP Android bots from stomping on each other. Turns out, they don't, even without this... they're writing most files to completely separate paths: - GYP puts most data under $EXTERNAL_STORAGE, generally /sdcard and its binaries (libdm.so, libnanobench.so, libskia.so, skia_launcher) in /data/local/tmp; - GN puts everything under /data/local/tmp, and its binaries (dm, nanobench) don't overlap GYP's. So clearing /data/local/tmp was essentially just removing GN's data; GYP's data file caching was never affected and can't conflict with GN's. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2340473002 Review-Url: https://codereview.chromium.org/2340473002 --- .../recipe_modules/flavor/gn_android_flavor.py | 4 ---- ...droidOne-CPU-MT6582-arm-Release-GN_Android.json | 22 ---------------------- 2 files changed, 26 deletions(-) diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index 85ab373..2782bff 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -63,15 +63,11 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): def install(self): self._adb('reboot', 'reboot') self._adb('wait for device', 'wait-for-usb-device') - self._adb('TEMPORARY clear /data/local/tmp', - 'shell', 'rm', '-rf', '/data/local/tmp/*') self._adb('mkdir /data/local/tmp/resources', 'shell', 'mkdir', '-p', '/data/local/tmp/resources') def cleanup_steps(self): if self._ever_ran_adb: - self._adb('TEMPORARY clear /data/local/tmp', - 'shell', 'rm', '-rf', '/data/local/tmp/*') self._adb('TEMPORARY reboot', 'reboot') self._adb('kill adb server', 'kill-server') diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json index cd42b80..9571c97 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json @@ -19,17 +19,6 @@ "cmd": [ "adb", "shell", - "rm", - "-rf", - "/data/local/tmp/*" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "TEMPORARY clear /data/local/tmp" - }, - { - "cmd": [ - "adb", - "shell", "mkdir", "-p", "/data/local/tmp/resources" @@ -603,17 +592,6 @@ { "cmd": [ "adb", - "shell", - "rm", - "-rf", - "/data/local/tmp/*" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "TEMPORARY clear /data/local/tmp (2)" - }, - { - "cmd": [ - "adb", "reboot" ], "cwd": "[SLAVE_BUILD]/skia", -- 2.7.4