Skip to content

Commit 5e37d3c

Browse files
authored
Update Android examples to use Android Platforms. (#338)
Part of bazelbuild/bazel#16285. Several of these just forcible turn off Android platforms due to other issues (including bazelbuild/rules_android#77)
1 parent c024032 commit 5e37d3c

File tree

3 files changed

+63
-66
lines changed

3 files changed

+63
-66
lines changed

.bazelci/android.yml

Lines changed: 54 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,86 @@
11
---
2-
tasks:
3-
android-firebase-linux:
2+
common:
3+
android-firebase: &android-firebase
44
name: "Android Firebase Cloud Messaging"
5-
platform: ubuntu1804
5+
bazel: last_green
66
working_directory: ../android/firebase-cloud-messaging
7+
build_flags:
8+
- "--incompatible_enable_android_toolchain_resolution"
9+
- "--android_platforms=//:arm64-v8a"
10+
build_targets:
11+
- "//app:app"
12+
android-ndk: &android-ndk
13+
name: "Android NDK"
14+
bazel: 6.3.2
15+
working_directory: ../android/ndk
16+
build_flags:
17+
# TODO(https://github.com/bazelbuild/rules_android/issues/77):
18+
# Enable Android Platforms.
19+
- "--noincompatible_enable_android_toolchain_resolution"
20+
- "--fat_apk_cpu=arm64-v8a,x86"
21+
- "--android_crosstool_top=@androidndk//:toolchain"
722
build_targets:
8-
- "..."
23+
- "//app/src/main:app"
24+
android-jetpack: &android-jetpack
25+
name: "Android Jetpack Compose"
26+
# Cannot upgrade this until rules_kotlin is compatible.
27+
bazel: 6.3.2
28+
working_directory: ../android/jetpack-compose
29+
build_flags:
30+
- "--noincompatible_enable_android_toolchain_resolution"
31+
- "--remote_download_outputs=all"
32+
build_targets:
33+
- "//app/src/main:app"
34+
android-robolectric: &android-robolectric
35+
name: "Android Robolectric Testing"
36+
# Cannot upgrade this until rules_kotlin is compatible.
37+
bazel: 6.3.2
38+
working_directory: ../android/robolectric-testing
39+
build_flags:
40+
- "--noincompatible_enable_android_toolchain_resolution"
41+
test_targets:
42+
- "//app:test"
43+
44+
tasks:
45+
android-firebase-linux:
46+
platform: ubuntu1804
47+
<<: *android-firebase
948
android-firebase-macos:
10-
name: "Android Firebase Cloud Messaging"
1149
platform: macos
12-
working_directory: ../android/firebase-cloud-messaging
13-
build_targets:
14-
- "..."
50+
<<: *android-firebase
1551
android-firebase-windows:
16-
name: "Android Firebase Cloud Messaging"
1752
platform: windows
18-
working_directory: ../android/firebase-cloud-messaging
19-
build_targets:
20-
- "..."
53+
<<: *android-firebase
2154
android-ndk-linux:
22-
name: "Android NDK"
2355
platform: ubuntu1804
24-
working_directory: ../android/ndk
2556
environment:
2657
ANDROID_NDK_HOME: /opt/android-ndk-r25b
27-
build_flags:
28-
- "--fat_apk_cpu=arm64-v8a,x86"
29-
- "--android_crosstool_top=@androidndk//:toolchain"
30-
build_targets:
31-
- "//app/src/main:app"
58+
<<: *android-ndk
3259
android-ndk-macos:
33-
name: "Android NDK"
3460
platform: macos
35-
working_directory: ../android/ndk
3661
environment:
3762
ANDROID_NDK_HOME: /Users/buildkite/android-ndk-r25b
38-
build_flags:
39-
- "--fat_apk_cpu=arm64-v8a,x86"
40-
- "--android_crosstool_top=@androidndk//:toolchain"
41-
build_targets:
42-
- "//app/src/main:app"
63+
<<: *android-ndk
4364
# NDK project is not building on Windows yet.
4465
# https://github.com/bazelbuild/examples/issues/94
4566
# android-ndk-windows:
46-
# name: "Android NDK"
4767
# platform: windows
48-
# working_directory: ../android/ndk
49-
# build_targets:
50-
# - "//app/src/main:app"
68+
# <<: *android-ndk
5169
android-jetpack-compose-linux:
52-
name: "Android Jetpack Compose"
5370
platform: ubuntu1804
54-
working_directory: ../android/jetpack-compose
55-
build_flags:
56-
- "--remote_download_outputs=all"
57-
build_targets:
58-
- "//app/src/main:app"
71+
<<: *android-jetpack
5972
android-jetpack-compose-macos:
60-
name: "Android Jetpack Compose"
6173
platform: macos
62-
working_directory: ../android/jetpack-compose
63-
build_flags:
64-
- "--remote_download_outputs=all"
65-
build_targets:
66-
- "//app/src/main:app"
74+
<<: *android-jetpack
6775
android-jetpack-compose-windows:
68-
name: "Android Jetpack Compose"
6976
platform: windows
70-
working_directory: ../android/jetpack-compose
71-
build_flags:
72-
- "--remote_download_outputs=all"
73-
build_targets:
74-
- "//app/src/main:app"
77+
<<: *android-jetpack
7578
android-robolectric-testing-linux:
76-
name: "Android Robolectric Testing"
7779
platform: ubuntu1804
78-
working_directory: ../android/robolectric-testing
79-
build_targets:
80-
- "..."
81-
test_targets:
82-
- "..."
80+
<<: *android-robolectric
8381
android-robolectric-testing-macos:
84-
name: "Android Robolectric Testing"
8582
platform: macos
86-
working_directory: ../android/robolectric-testing
87-
build_targets:
88-
- "..."
89-
test_targets:
90-
- "..."
83+
<<: *android-robolectric
9184
# android-robolectric-testing-windows:
92-
# name: "Android Robolectric Testing"
9385
# platform: windows
94-
# working_directory: ../android/robolectric-testing
95-
# build_targets:
96-
# - "..."
97-
# test_targets:
98-
# - "..."
86+
# <<: *android-robolectric
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+
)

android/firebase-cloud-messaging/WORKSPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44
# Requires ANDROID_HOME set to the path of your Android SDK.
55
android_sdk_repository(name = "androidsdk")
66

7+
android_ndk_repository(name = "androidndk")
8+
79
RULES_JVM_EXTERNAL_TAG = "2.9"
810

911
RULES_JVM_EXTERNAL_SHA = "e5b97a31a3e8feed91636f42e19b11c49487b85e5de2f387c999ea14d77c7f45"

0 commit comments

Comments
 (0)