Skip to content

Commit 485f147

Browse files
committed
Move executable path constants into paths file
Change-Id: Iff8073f876e4e78cc61ccf5a9bb028378ac80393
1 parent 6fbd7e6 commit 485f147

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

config.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,6 @@
3636
HOST_CXX_WRAPPER_TEMPLATE: Path = TEMPLATES_PATH / 'host_cxx_wrapper.template'
3737
HOST_TARGET_TEMPLATE: Path = TEMPLATES_PATH / 'host_target.template'
3838

39-
CARGO_PATH: Path = RUST_PREBUILT_PATH / 'bin' / 'cargo'
40-
RUSTC_PATH: Path = RUST_PREBUILT_PATH / 'bin' / 'rustc'
41-
PYTHON_PATH: Path = PYTHON_PREBUILT_PATH / 'bin' / 'python3'
42-
CC_PATH: Path = LLVM_PREBUILT_PATH / 'bin' / 'clang'
43-
CXX_PATH: Path = LLVM_PREBUILT_PATH / 'bin' / 'clang++'
44-
AR_PATH: Path = LLVM_PREBUILT_PATH / 'bin' / 'llvm-ar'
45-
RANLIB_PATH: Path = LLVM_PREBUILT_PATH / 'bin' / 'llvm-ranlib'
46-
CXXSTD_PATH: Path = LLVM_PREBUILT_PATH / 'include' / 'c++' / 'v1'
47-
4839
# Add the path at which libc++ can be found in Android checkouts
4940
CXX_LINKER_FLAGS: str = ' -Wl,-rpath,'
5041
if build_platform.system() == 'darwin':

paths.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,16 @@
5656
NDK_PATH: Path = WORKSPACE_PATH / 'toolchain' / 'prebuilts' / 'ndk' / 'r23'
5757
NDK_LLVM_PATH: Path = NDK_PATH / 'toolchains' / 'llvm' / 'prebuilt' / 'linux-x86_64'
5858
NDK_SYSROOT_PATH: Path = NDK_LLVM_PATH / 'sysroot'
59+
60+
#
61+
# Paths to executables
62+
#
63+
64+
CARGO_PATH: Path = RUST_PREBUILT_PATH / 'bin' / 'cargo'
65+
RUSTC_PATH: Path = RUST_PREBUILT_PATH / 'bin' / 'rustc'
66+
PYTHON_PATH: Path = PYTHON_PREBUILT_PATH / 'bin' / 'python3'
67+
CC_PATH: Path = LLVM_PREBUILT_PATH / 'bin' / 'clang'
68+
CXX_PATH: Path = LLVM_PREBUILT_PATH / 'bin' / 'clang++'
69+
AR_PATH: Path = LLVM_PREBUILT_PATH / 'bin' / 'llvm-ar'
70+
RANLIB_PATH: Path = LLVM_PREBUILT_PATH / 'bin' / 'llvm-ranlib'
71+
CXXSTD_PATH: Path = LLVM_PREBUILT_PATH / 'include' / 'c++' / 'v1'

0 commit comments

Comments
 (0)