AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove clear /data/local/tmp steps.

Browse Source 
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
This commit is contained in:
mtklein 2016-09-13 11:17:58 -07:00 committed by Commit bot
parent 6270e558c3
commit 649985a530
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infra/bots/recipe_modules/flavor/gn_android_flavor.py
View File

@ -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')

22
infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json
View File

@ -15,17 +15,6 @@
"cwd": "[SLAVE_BUILD]/skia",
"name": "wait for device"
},
{
"cmd": [
"adb",
"shell",
"rm",
"-rf",
"/data/local/tmp/*"
],
"cwd": "[SLAVE_BUILD]/skia",
"name": "TEMPORARY clear /data/local/tmp"
},
{
"cmd": [
"adb",
@ -600,17 +589,6 @@
"cwd": "[SLAVE_BUILD]/skia",
"name": "pull /data/local/tmp/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm"
},
{
"cmd": [
"adb",
"shell",
"rm",
"-rf",
"/data/local/tmp/*"
],
"cwd": "[SLAVE_BUILD]/skia",
"name": "TEMPORARY clear /data/local/tmp (2)"
},
{
"cmd": [
"adb",