Skip to content

Commit f5389c2

Browse files
[Android] Update BUILD.gn API level 30 to 34 (project-chip#40616)
update android_building.md with API 34
1 parent 688199e commit f5389c2

File tree

12 files changed

+20
-20
lines changed

12 files changed

+20
-20
lines changed

.github/workflows/full-android.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-android:162
39+
image: ghcr.io/project-chip/chip-build-android:163
4040
volumes:
4141
- "/tmp/log_output:/tmp/test_logs"
4242

.github/workflows/smoketest-android.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: github.actor != 'restyled-io[bot]'
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build-android:162
37+
image: ghcr.io/project-chip/chip-build-android:163
3838
volumes:
3939
- "/:/runner-root-volume"
4040
- "/tmp/log_output:/tmp/test_logs"

docs/platforms/android/android_building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ downloaded.
6363
Cake) API Level 34
6464
2. Apply
6565
5. Install Emulator:
66-
1. Tools -> Device Manager -> Create device -> Pixel 5 -> Android S API 31
66+
1. Tools -> Device Manager -> Create device -> Pixel 5 -> Android S API 34
6767
-> Download
6868

6969
### Linux

examples/android/CHIPTest/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ android_library("java") {
7272
}
7373

7474
java_prebuilt("android") {
75-
jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
75+
jar_path = "${android_sdk_root}/platforms/android-34/android.jar"
7676
}
7777

7878
group("default") {

examples/tv-app/android/App/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/tv-app/android/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,11 @@ android_library("java") {
167167
javac_flags = [ "-Xlint:deprecation" ]
168168

169169
# TODO: add classpath support (we likely need to add something like
170-
# ..../platforms/android-30/android.jar to access BLE items)
170+
# ..../platforms/android-34/android.jar to access BLE items)
171171
}
172172

173173
java_prebuilt("android") {
174-
jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
174+
jar_path = "${android_sdk_root}/platforms/android-34/android.jar"
175175
}
176176

177177
group("default") {

examples/tv-casting-app/android/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ android_library("java") {
121121
javac_flags = [ "-Xlint:deprecation" ]
122122

123123
# TODO: add classpath support (we likely need to add something like
124-
# ..../platforms/android-30/android.jar to access BLE items)
124+
# ..../platforms/android-34/android.jar to access BLE items)
125125
}
126126

127127
java_prebuilt("android") {
128-
jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
128+
jar_path = "${android_sdk_root}/platforms/android-34/android.jar"
129129
}
130130

131131
group("default") {

examples/virtual-device-app/android/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ android_library("java") {
8585
javac_flags = [ "-Xlint:deprecation" ]
8686

8787
# TODO: add classpath support (we likely need to add something like
88-
# ..../platforms/android-30/android.jar to access BLE items)
88+
# ..../platforms/android-34/android.jar to access BLE items)
8989
}
9090

9191
java_prebuilt("android") {
92-
jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
92+
jar_path = "${android_sdk_root}/platforms/android-34/android.jar"
9393
}
9494

9595
group("default") {

src/app/server/java/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ android_library("java") {
7474
javac_flags = [ "-Xlint:deprecation" ]
7575

7676
# TODO: add classpath support (we likely need to add something like
77-
# ..../platforms/android-30/android.jar to access BLE items)
77+
# ..../platforms/android-34/android.jar to access BLE items)
7878
}
7979

8080
java_prebuilt("android") {
81-
jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
81+
jar_path = "${android_sdk_root}/platforms/android-34/android.jar"
8282
}

src/controller/java/BUILD.gn

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ android_library("java") {
686686
]
687687

688688
# TODO: add classpath support (we likely need to add something like
689-
# ..../platforms/android-30/android.jar to access BLE items)
689+
# ..../platforms/android-34/android.jar to access BLE items)
690690
}
691691

692692
if (chip_link_tests) {
@@ -718,7 +718,7 @@ if (chip_link_tests) {
718718
javac_flags = [ "-Xlint:deprecation" ]
719719

720720
# TODO: add classpath support (we likely need to add something like
721-
# ..../platforms/android-30/android.jar to access BLE items)
721+
# ..../platforms/android-34/android.jar to access BLE items)
722722
}
723723

724724
android_library("tests") {
@@ -753,12 +753,12 @@ if (chip_link_tests) {
753753
javac_flags = [ "-Xlint:deprecation" ]
754754

755755
# TODO: add classpath support (we likely need to add something like
756-
# ..../platforms/android-30/android.jar to access BLE items)
756+
# ..../platforms/android-34/android.jar to access BLE items)
757757
}
758758
}
759759

760760
if (!matter_enable_java_compilation) {
761761
java_prebuilt("android") {
762-
jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
762+
jar_path = "${android_sdk_root}/platforms/android-34/android.jar"
763763
}
764764
}

0 commit comments

Comments
 (0)