Skip to content

Commit dbf3399

Browse files
authored
Null-out Android env for non-Android macos builds (#700)
The Intel `macos` deployment does not have the latest Android build tools installed, so for these builds, we have to manually nullify the Android environment variables.
1 parent 42a0b6d commit dbf3399

4 files changed

Lines changed: 22 additions & 1 deletion

File tree

.bazelci/configurations.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ windows: &windows
2424
#
2525
configurations: &configurations
2626
working_directory: ../configurations
27+
environment:
28+
ANDROID_HOME: ""
29+
ANDROID_NDK_HOME: ""
2730
build_targets:
2831
- "..."
2932
# These targets demonstrate failures: they're never meant to build.

.bazelci/misc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ tasks:
1111
java-maven-macos:
1212
name: "Maven Java App"
1313
platform: macos
14+
environment:
15+
ANDROID_HOME: ""
16+
ANDROID_NDK_HOME: ""
1417
working_directory: ../java-maven
1518
build_targets:
1619
- "..."

.bazelci/tutorial-cpp.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ tasks:
99
cpp-stage1-macos:
1010
name: "C++ Stage 1"
1111
platform: macos
12+
environment:
13+
ANDROID_HOME: ""
14+
ANDROID_NDK_HOME: ""
1215
working_directory: ../cpp-tutorial/stage1
1316
build_targets:
1417
- "..."
@@ -27,6 +30,9 @@ tasks:
2730
cpp-stage2-macos:
2831
name: "C++ Stage 2"
2932
platform: macos
33+
environment:
34+
ANDROID_HOME: ""
35+
ANDROID_NDK_HOME: ""
3036
working_directory: ../cpp-tutorial/stage2
3137
build_targets:
3238
- "..."
@@ -45,6 +51,9 @@ tasks:
4551
cpp-stage3-macos:
4652
name: "C++ Stage 3"
4753
platform: macos
54+
environment:
55+
ANDROID_HOME: ""
56+
ANDROID_NDK_HOME: ""
4857
working_directory: ../cpp-tutorial/stage3
4958
build_targets:
5059
- "..."

.bazelci/tutorial-java.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ tasks:
99
java-tutorial-macos:
1010
name: "Java Tutorial"
1111
platform: macos
12+
environment:
13+
ANDROID_HOME: ""
14+
ANDROID_NDK_HOME: ""
1215
working_directory: ../java-tutorial
1316
build_targets:
1417
- "//:ProjectRunner"
@@ -22,6 +25,9 @@ tasks:
2225
query-quickstart:
2326
name: "Query Quickstart"
2427
platform: macos
28+
environment:
29+
ANDROID_HOME: ""
30+
ANDROID_NDK_HOME: ""
2531
working_directory: ../query-quickstart
2632
build_targets:
27-
- "//:runner"
33+
- "//:runner"

0 commit comments

Comments
 (0)