Skip to content

Commit

Permalink
Clean up some GN/hermetic build changes.
Browse files Browse the repository at this point in the history
No functional changes, just style.

BUG=

Review-Url: https://codereview.chromium.org/2401573005
Cr-Commit-Position: refs/heads/master@{#424199}
  • Loading branch information
erikchen authored and Commit bot committed Oct 10, 2016
1 parent 8c9a63e commit 55e37ff
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build/config/mac/compile_xib.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def main():
help='Path to Xcode.')
args, unknown_args = parser.parse_known_args()

if (args.developer_dir):
if args.developer_dir:
os.environ['DEVELOPER_DIR'] = args.developer_dir

ibtool_args = [
Expand Down
2 changes: 1 addition & 1 deletion build/config/mac/xcrun.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
help='Path to Xcode.')
args, unknown_args = parser.parse_known_args()

if (args.developer_dir):
if args.developer_dir:
os.environ['DEVELOPER_DIR'] = args.developer_dir

rv = subprocess.check_call(['xcrun'] + unknown_args)
Expand Down
10 changes: 5 additions & 5 deletions build/toolchain/toolchain.gni
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ declare_args() {
# obtained with gclient sync after setting the environment variable
# FORCE_MAC_TOOLCHAIN].
use_system_xcode = true

# The path to the hermetic install of Xcode. Only relevant when
# use_system_xcode = false.
hermetic_xcode_path =
rebase_path("//build/mac_files/Xcode.app", "", root_build_dir)
}

# The path to the hermetic install of Xcode. Only relevant when
# use_system_xcode = false.
hermetic_xcode_path =
rebase_path("//build/mac_files/Xcode.app", "", root_build_dir)

declare_args() {
if (is_clang) {
# Clang compiler version. Clang files are placed at version-dependent paths.
Expand Down
2 changes: 1 addition & 1 deletion chrome/tools/build/mac/run_verify_order.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
help='Path to Xcode.')

args, unknown_args = parser.parse_known_args()
if (args.developer_dir):
if args.developer_dir:
os.environ['DEVELOPER_DIR'] = args.developer_dir

this_script_dir = os.path.dirname(sys.argv[0])
Expand Down

0 comments on commit 55e37ff

Please sign in to comment.