Skip to content

Change get_tool_for_action to return absolute paths #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Change get_tool_for_action to return absolute paths #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
079996f
add ndk_path
widiba03304 Jan 24, 2025
8ddfa8e
propagate clang directory
widiba03304 Jan 25, 2025
af11b47
fix cxx_builtin_include_directories also have absolute paths
widiba03304 Jan 25, 2025
936cdc9
remove debug print
widiba03304 Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions BUILD.ndk_clang.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ cc_toolchain_suite(
target_system_name = target_system_name,
toolchain_identifier = "toolchain_identifier_%s" % target_system_name,
executable_extension = "{executable_extension}",
ndk_path = "{ndk_path}",
clang_directory = "{clang_directory}",
) for target_system_name in TARGET_SYSTEM_NAMES]

filegroup(
Expand Down
34 changes: 18 additions & 16 deletions ndk_cc_toolchain_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1459,24 +1459,24 @@ def ndk_cc_toolchain_config_rule_implementation(ctx):
api_level = ctx.attr.api_level,
target_system_name = ctx.attr.target_system_name,
tools = {
"clang": "bin/clang" + ctx.attr.executable_extension,
"ar": "bin/llvm-ar" + ctx.attr.executable_extension,
"cpp": "bin/clang++" + ctx.attr.executable_extension,
"dwp": "bin/llvm-dwp" + ctx.attr.executable_extension,
"gcc": "bin/clang" + ctx.attr.executable_extension,
"gcov": "bin/gcov" + ctx.attr.executable_extension,
"ld": "bin/ld" + ctx.attr.executable_extension,
"nm": "bin/llvm-nm" + ctx.attr.executable_extension,
"objcopy": "bin/llvm-objcopy" + ctx.attr.executable_extension,
"objdump": "bin/llvm-objdump" + ctx.attr.executable_extension,
"strip": "bin/llvm-strip" + ctx.attr.executable_extension,
"clang": ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/bin/clang" + ctx.attr.executable_extension,
"ar": ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/bin/llvm-ar" + ctx.attr.executable_extension,
"cpp": ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/bin/clang++" + ctx.attr.executable_extension,
"dwp": ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/bin/llvm-dwp" + ctx.attr.executable_extension,
"gcc": ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/bin/clang" + ctx.attr.executable_extension,
"gcov": ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/bin/gcov" + ctx.attr.executable_extension,
"ld": ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/bin/ld" + ctx.attr.executable_extension,
"nm": ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/bin/llvm-nm" + ctx.attr.executable_extension,
"objcopy": ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/bin/llvm-objcopy" + ctx.attr.executable_extension,
"objdump": ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/bin/llvm-objdump" + ctx.attr.executable_extension,
"strip": ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/bin/llvm-strip" + ctx.attr.executable_extension,
},
cxx_builtin_include_directories = [
"sysroot/usr/include/c++/v1",
"sysroot/usr/local/include",
ctx.attr.clang_resource_directory,
"sysroot/usr/include/%s" % ctx.attr.target_system_name,
"sysroot/usr/include",
ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/sysroot/usr/include/c++/v1",
ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/sysroot/usr/local/include",
ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/" + ctx.attr.clang_resource_directory,
ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/sysroot/usr/include/%s" % ctx.attr.target_system_name,
ctx.attr.ndk_path + "/" + ctx.attr.clang_directory + "/sysroot/usr/include",
],
toolchain_identifier = ctx.attr.toolchain_identifier,
target_cpu = {
Expand Down Expand Up @@ -1511,6 +1511,8 @@ ndk_cc_toolchain_config_rule = rule(
),
"toolchain_identifier": attr.string(mandatory = True),
"executable_extension": attr.string(default = ""),
"ndk_path": attr.string(default = ""),
"clang_directory": attr.string(default = ""),
},
)

Expand Down
2 changes: 2 additions & 0 deletions rules.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ def _android_ndk_repository_impl(ctx):
"{clang_resource_directory}": clang_resource_directory,
"{sysroot_directory}": sysroot_directory,
"{executable_extension}": executable_extension,
"{ndk_path}": ndk_path,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't this break remote caching if different developers install their NDKs in different locations?

"{clang_directory}": clang_directory,
},
executable = False,
)
Expand Down