Skip to content

Android toolchain #712

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

Merged
birunts merged 2 commits into from
Mar 5, 2025
Merged

Android toolchain #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04302a0
fix: update bazelisk version in pre-commit Docker
BrandonThomasJonesARM Mar 4, 2025
5b8de93
feat(androidNinja): initial toolchain options
BrandonThomasJonesARM Mar 3, 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
4 changes: 2 additions & 2 deletions .github/pre-commit.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM golang:1.20-bullseye as go
FROM golang:1.22-bullseye as go

ARG BAZELISK_VERSION=1.16.0
ARG BAZELISK_VERSION=1.25.0
RUN CGO_ENABLED=0 GOOS=linux GOBIN=/opt/bazelisk/bin go install github.com/bazelbuild/bazelisk@v${BAZELISK_VERSION}

FROM debian:bullseye-slim
Expand Down
5 changes: 2 additions & 3 deletions MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions core/toolchain/clang.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,20 @@ func newToolchainClangCommon(props *config.Properties, tgt TgtType) (tc toolchai

tc.target = props.GetString(string(tgt) + "_clang_triple")

out_of_tree, _ := props.GetBoolMaybe("android_out_of_tree")

// Here we add flags relating to android out of tree builds
if out_of_tree {
tc.cflags = append(tc.cflags, "-DANDROID")

if tgt == TgtTypeTarget {
tc.target = "aarch64-linux-android10000" // TODO: This should detect API version instead of dev?
tc.cflags = append(tc.cflags, "-march=armv8-a+crypto+sha2")
tc.cflags = append(tc.cflags, "-nostdlibinc")
tc.cflags = append(tc.cflags, "-fPIC")
}
}

if tc.target != "" {
tc.cflags = append(tc.cflags, "-target", tc.target)
tc.ldflags = append(tc.ldflags, "-target", tc.target)
Expand Down
1 change: 1 addition & 0 deletions gazelle/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_go", version = "0.52.0", repo_name = "io_bazel_rules_go")
bazel_dep(name = "gazelle", version = "0.41.0", repo_name = "bazel_gazelle")
bazel_dep(name = "bob-build", version = "0.0.1", repo_name = "bob")
bazel_dep(name = "rules_cc", version = "0.0.16")

# NOTE: https://github.com/bazelbuild/bazel/issues/17271
local_path_override(
Expand Down
Loading