Skip to content

Commit eb251f9

Browse files
authored
Add Android Platforms build flags. (#1054)
1 parent fe6589f commit eb251f9

File tree

9 files changed

+56
-6
lines changed

9 files changed

+56
-6
lines changed

.bazelci/presubmit.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,24 @@ tasks:
4646
name: "Example - Android"
4747
platform: ubuntu1804
4848
working_directory: examples/android
49-
bazel: 7.0.0-pre.20230906.2
49+
bazel: last_green
5050
test_flags:
51+
- "--incompatible_enable_android_toolchain_resolution"
52+
- "--android_platforms=//:arm64-v8a"
5153
- "--enable_bzlmod=false"
5254
test_targets:
53-
- //...
55+
- //app:all
5456
example-bzlmod-android:
5557
name: "Example Bzlmod - Android"
5658
platform: ubuntu1804
5759
working_directory: examples/android
58-
bazel: 7.0.0-pre.20230906.2
60+
bazel: last_green
5961
test_flags:
62+
- "--incompatible_enable_android_toolchain_resolution"
63+
- "--android_platforms=//:arm64-v8a"
6064
- "--enable_bzlmod=true"
6165
test_targets:
62-
- //...
66+
- //app:all
6367
example-ksp:
6468
name: "Example - Android KSP"
6569
platform: ubuntu1804
@@ -76,8 +80,12 @@ tasks:
7680
name: "Example - Anvil"
7781
platform: ubuntu1804
7882
working_directory: examples/anvil
83+
bazel: last_green
84+
test_flags:
85+
- "--incompatible_enable_android_toolchain_resolution"
86+
- "--android_platforms=//:arm64-v8a"
7987
test_targets:
80-
- //...
88+
- //app:all
8189
example-plugins:
8290
name: "Example - Plugins"
8391
platform: ubuntu1804
@@ -162,8 +170,12 @@ tasks:
162170
name: "Example - Jetpack Compose"
163171
platform: ubuntu1804
164172
working_directory: examples/jetpack_compose
173+
bazel: last_green
174+
test_flags:
175+
- "--incompatible_enable_android_toolchain_resolution"
176+
- "--android_platforms=//:arm64-v8a"
165177
test_targets:
166-
- //...
178+
- //app:all
167179
stardoc:
168180
name: Stardoc api documentation
169181
platform: ubuntu1804

examples/android/BUILD.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
platform(
2+
name = "arm64-v8a",
3+
constraint_values = [
4+
"@platforms//cpu:arm64",
5+
"@platforms//os:android",
6+
],
7+
)

examples/android/MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ bazel_dep(name = "rules_android", version = "0.1.1")
77
bazel_dep(name = "bazel_skylib", version = "1.2.1")
88
bazel_dep(name = "rules_robolectric", version = "4.10.3", repo_name = "robolectric")
99
bazel_dep(name = "rules_java", version = "6.4.0")
10+
bazel_dep(name = "platforms", version = "0.0.7")
1011
bazel_dep(name = "rules_kotlin")
1112
local_path_override(
1213
module_name = "rules_kotlin",

examples/android/WORKSPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,5 @@ http_archive(
8888
load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
8989

9090
robolectric_repositories()
91+
92+
android_ndk_repository(name = "androidndk")

examples/anvil/BUILD.bazel

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,11 @@ define_kt_toolchain(
44
name = "kotlin_toolchain",
55
jvm_target = "1.8",
66
)
7+
8+
platform(
9+
name = "arm64-v8a",
10+
constraint_values = [
11+
"@platforms//cpu:arm64",
12+
"@platforms//os:android",
13+
],
14+
)

examples/anvil/WORKSPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ load("@rules_android//android:rules.bzl", "android_sdk_repository")
2828

2929
android_sdk_repository(name = "androidsdk")
3030

31+
android_ndk_repository(name = "androidndk")
32+
3133
# Skylib, for build_test, so don't bother initializing the unit test infrastructure.
3234
http_archive(
3335
name = "bazel_skylib",

examples/anvil/app/BUILD.bazel

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@bazel_skylib//rules:build_test.bzl", "build_test")
12
load("@rules_android//android:rules.bzl", "android_binary")
23

34
android_binary(
@@ -9,3 +10,10 @@ android_binary(
910
"//app/src/main/java/com/squareup/anvil/sample",
1011
],
1112
)
13+
14+
build_test(
15+
name = "force_build_apks_test",
16+
targets = [
17+
":app.apk",
18+
],
19+
)

examples/jetpack_compose/BUILD

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,11 @@ kt_compiler_plugin(
2525
"@maven//:androidx_compose_compiler_compiler",
2626
],
2727
)
28+
29+
platform(
30+
name = "arm64-v8a",
31+
constraint_values = [
32+
"@platforms//cpu:arm64",
33+
"@platforms//os:android",
34+
],
35+
)

examples/jetpack_compose/WORKSPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,5 @@ http_archive(
8585
load("@rules_android//android:rules.bzl", "android_sdk_repository")
8686

8787
android_sdk_repository(name = "androidsdk")
88+
89+
android_ndk_repository(name = "androidndk")

0 commit comments

Comments
 (0)