Skip to content

Commit 02af89e

Browse files
author
Misha Efimov
committed
[Cronet] Use developer_dir to find Xcode toolchain on official bots.
Bug: 774814 Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet Change-Id: I442f55b957017119b5241993ee0f90ae63a86557 Reviewed-on: https://chromium-review.googlesource.com/729126 Reviewed-by: Andrei Kapishnikov <[email protected]> Commit-Queue: Misha Efimov <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#510231}(cherry picked from commit d5ccb43) Reviewed-on: https://chromium-review.googlesource.com/729380 Cr-Commit-Position: refs/branch-heads/3239@{#94} Cr-Branched-From: adb61db-refs/heads/master@{#508578}
1 parent 376bcff commit 02af89e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

components/cronet/tools/hide_symbols.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,15 @@ def main():
6060

6161
if options.developer_dir:
6262
os.environ['DEVELOPER_DIR'] = options.developer_dir
63-
developer_dir = options.developer_dir
63+
developer_dir = options.developer_dir + '/Contents/Developer'
6464
else:
6565
developer_dir = subprocess.check_output(
6666
['xcode-select', '--print-path']).strip()
6767

6868
xctoolchain_libs = glob.glob(developer_dir
6969
+ '/Toolchains/XcodeDefault.xctoolchain/usr/lib'
7070
+ '/clang/*/lib/darwin/*.ios.a')
71+
print "Adding xctoolchain_libs: ", xctoolchain_libs
7172

7273
# ld -r concatenates multiple .o files and .a files into a single .o file,
7374
# while "hiding" symbols not marked as visible.

0 commit comments

Comments
 (0)