Skip to content

Commit 65cdd58

Browse files
zijiehe-google-comCommit Queue
authored andcommitted
[fuchsia] Uprev test-scripts with FUCHSIA_READELF env
Copied from http://go/dart-reviews/421761 with the essential fix to make it work. 1) Add the env to select the right readelf. 2) Remove the removal of arch/, it's referred by meta.json. Cq-Include-Trybots: luci.dart.try:vm-fuchsia-release-x64-try,vm-fuchsia-release-arm64-try Bug: b/407890258, b/338009514 Change-Id: Ib7ae646e57082d310d3d76ca16834faefb888201 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/421881 Auto-Submit: Zijie He <[email protected]> Reviewed-by: Ryan Macnak <[email protected]> Commit-Queue: Ryan Macnak <[email protected]>
1 parent e22f0e8 commit 65cdd58

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

DEPS

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ deps = {
546546
"packages": [
547547
{
548548
"package": "chromium/fuchsia/test-scripts",
549-
"version": "FZdRtNwH7jmADecj60ClOK69AHHnfTvvuwKLUgY0_AoC",
549+
"version": "mApUsju36efRytN4WFdopPYMfYgAI8ODzTmYq3zNEqsC",
550550
}
551551
],
552552
"condition": 'download_fuchsia_deps',
@@ -682,16 +682,6 @@ hooks = [
682682
Var('emsdk_ver')],
683683
'condition': 'download_emscripten'
684684
},
685-
{
686-
'name': 'Erase arch/ from fuchsia sdk',
687-
'pattern': '.',
688-
'action': [
689-
'rm',
690-
'-rf',
691-
'sdk/third_party/fuchsia/sdk/linux/arch',
692-
],
693-
'condition': 'download_fuchsia_deps'
694-
},
695685
{
696686
'name': 'Download Fuchsia system images',
697687
'pattern': '.',

build/fuchsia/with_envs.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ def Main():
4545
os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'],
4646
'third_party', 'fuchsia',
4747
'gn-sdk', 'src')
48+
os.environ['FUCHSIA_READELF'] = os.path.join(os.environ['SRC_ROOT'],
49+
'buildtools', 'linux-x64',
50+
'clang', 'bin', 'llvm-readelf')
4851

4952
with subprocess.Popen(sys.argv[1:]) as proc:
5053
try:

0 commit comments

Comments
 (0)