Skip to content

Commit 5425e22

Browse files
yunhanw-googlerestyled-commits
authored and
pimpalemahesh
committed
[Android] update android sdk version (project-chip#37445)
* update android sdk version * Update full-android.yaml * Update smoketest-android.yaml * Update smoke-test.yaml * Update full-android.yaml * Update smoketest-android.yaml * Update smoke-test.yaml * Update java-tests.yaml * Update android_building.md * Update README.md * Restyled by prettier-markdown * Update full-android.yaml * Update java-tests.yaml * Update smoketest-android.yaml * Update smoke-test.yaml * Update smoketest-android.yaml * Update full-android.yaml * update java_path with java_home --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 773c248 commit 5425e22

File tree

22 files changed

+59
-55
lines changed

22 files changed

+59
-55
lines changed

‎.github/workflows/full-android.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ jobs:
3333
name: Run
3434

3535
env:
36-
JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64/
36+
JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64/
3737

3838
runs-on: ubuntu-latest
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build-android:112
42+
image: ghcr.io/project-chip/chip-build-android:113
4343
volumes:
4444
- "/tmp/log_output:/tmp/test_logs"
4545

‎.github/workflows/java-tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
runs-on: ubuntu-latest
4444

4545
container:
46-
image: ghcr.io/project-chip/chip-build-java:104
46+
image: ghcr.io/project-chip/chip-build-java:113
4747
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
4848
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
4949

@@ -75,7 +75,7 @@ jobs:
7575
# TODO: this direct path loading is not maintainable. Our build system should define and
7676
# support test classes.
7777
run: |
78-
$JAVA_PATH/bin/java \
78+
$JAVA_HOME/bin/java \
7979
-cp 'third_party/java_deps/artifacts/*:out/linux-x64-tests/lib/src/controller/java/*' \
8080
org.junit.runner.JUnitCore \
8181
matter.tlv.TlvWriterTest \

‎.github/workflows/smoketest-android.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
name: Smoke Run - Android
3232

3333
env:
34-
JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64/
34+
JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64/
3535

3636
runs-on: ubuntu-latest
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-android:108
40+
image: ghcr.io/project-chip/chip-build-android:113
4141
volumes:
4242
- "/:/runner-root-volume"
4343
- "/tmp/log_output:/tmp/test_logs"

‎build/chip/java/config.gni

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
java_path = getenv("JAVA_PATH")
15+
java_home = getenv("JAVA_HOME")
1616
declare_args() {
1717
java_matter_controller_dependent_paths = []
1818

@@ -24,15 +24,15 @@ declare_args() {
2424
matter_enable_tlv_decoder_api = true
2525

2626
matter_enable_java_compilation = false
27-
if (java_path != "" && (current_os == "linux" || current_os == "mac")) {
28-
java_matter_controller_dependent_paths += [ "${java_path}/include/" ]
27+
if (java_home != "" && (current_os == "linux" || current_os == "mac")) {
28+
java_matter_controller_dependent_paths += [ "${java_home}/include/" ]
2929

3030
if (current_os == "mac") {
3131
java_matter_controller_dependent_paths +=
32-
[ "${java_path}/include/darwin/" ]
32+
[ "${java_home}/include/darwin/" ]
3333
} else {
3434
java_matter_controller_dependent_paths +=
35-
[ "${java_path}/include/linux/" ]
35+
[ "${java_home}/include/linux/" ]
3636
}
3737

3838
matter_enable_java_generated_api = false

‎build/chip/java/jar_runner.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ def FindCommand(command):
7979

8080

8181
def main():
82-
java_path = FindCommand('jar')
83-
if not java_path:
82+
java_home = FindCommand('jar')
83+
if not java_home:
8484
sys.stderr.write('jar: command not found\n')
8585
sys.exit(EXIT_FAILURE)
8686

@@ -89,7 +89,7 @@ def main():
8989
sys.stderr.write('usage: %s [jar_args]...\n' % sys.argv[0])
9090
sys.exit(EXIT_FAILURE)
9191

92-
return subprocess.check_call([java_path] + args)
92+
return subprocess.check_call([java_home] + args)
9393

9494

9595
if __name__ == '__main__':

‎build/chip/java/javac_runner.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ def ComputeClasspath(build_config_json):
9393

9494

9595
def main():
96-
java_path = FindCommand('javac')
97-
if not java_path:
96+
java_home = FindCommand('javac')
97+
if not java_home:
9898
sys.stderr.write('javac: command not found\n')
9999
sys.exit(EXIT_FAILURE)
100100

@@ -123,7 +123,7 @@ def main():
123123

124124
build_config_json = ReadBuildConfig(args.build_config)
125125
classpath = ComputeClasspath(build_config_json)
126-
java_args = [java_path]
126+
java_args = [java_home]
127127
if classpath:
128128
java_args += ["-classpath", classpath]
129129

‎build/chip/java/rules.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jar_runner = "${chip_root}/build/chip/java/jar_runner.py"
2222
write_build_config = "${chip_root}/build/chip/java/write_build_config.py"
2323

2424
assert(android_sdk_root != "" || matter_enable_java_compilation,
25-
"android_sdk_root must be specified or JAVA_PATH must be set.")
25+
"android_sdk_root must be specified or JAVA_HOME must be set.")
2626

2727
# Declare a java library target
2828
#

‎docs/platforms/android/android_building.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ downloaded.
5656
4. Apply
5757
3. Install Command Line Tools:
5858
1. Tools -> SDK Manager -> SDK Tools Tab -> Android SDK Command Line Tools
59-
(latest)
59+
10.0
6060
2. Apply
61-
4. Install SDK 26:
62-
1. Tools -> SDK Manager -> SDK Platforms Tab -> Android 8.0 (Oreo) SDK Level
63-
26
61+
4. Install SDK 30:
62+
1. Tools -> SDK Manager -> SDK Platforms Tab -> Android 11.0 (R) SDK Level
63+
30
6464
2. Apply
6565
5. Install Emulator:
6666
1. Tools -> Device Manager -> Create device -> Pixel 5 -> Android S API 31
@@ -98,21 +98,21 @@ architecture:
9898

9999
### Gradle & JDK Version
100100

101-
All Android projects utilize Gradle version 7.3.3 and JDK version 17.0.
101+
All Android projects utilize Gradle version 7.3.3 and JDK version 11.0.
102102

103-
For developer using openjdk-17-jdk in MacOS, the JAVA_HOME environment variable
104-
can be configured as follows via `sdkman`:
103+
For developer using java 11 in MacOS, the JAVA can be configured as follows via
104+
`sdkman`:
105105

106106
```
107-
sdk install java 17.0.4.1-tem
107+
sdk install java 11.0.26-tem
108108
```
109109

110-
For developer using openjdk-17-jdk in Linux, the JAVA_HOME environment variable
110+
For developer using openjdk-11-jdk in Linux, the JAVA_HOME environment variable
111111
can be configured as follows:
112112

113113
```
114-
sudo apt-get install openjdk-17-jdk
115-
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
114+
sudo apt-get install openjdk-11-jdk
115+
export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
116116
```
117117

118118
<a name="kotlin"></a>

‎examples/android/CHIPTest/BUILD.gn

+1-1
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-26/android.jar"
75+
jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
7676
}
7777

7878
group("default") {

‎examples/java-matter-controller/README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ cluster requests to a Matter device
99

1010
- [Matter Controller Java App Example](#matter-controller-java-app-example)
1111
- [Requirements for building](#requirements-for-building)
12+
- [Linux](#linux)
1213
- [Preparing for build](#preparing-for-build)
13-
- [Building & Running the app](#building--running-the-app)
14+
- [Building \& Running the app](#building--running-the-app)
1415

1516
<hr>
1617

@@ -47,6 +48,8 @@ system. You can install it through the following command as root:
4748
sudo apt install default-jdk
4849
```
4950

51+
Note: Current matter controller java app example needs java 8+.
52+
5053
You also need to install kotlin compiler on your Ubuntu system:
5154

5255
kotlin compiler version 1.8.10 or above is needed to compile
@@ -93,7 +96,7 @@ export PATH="/usr/lib/kotlinc/bin:$PATH"
9396
### Linux
9497

9598
```shell
96-
export JAVA_PATH=[JDK path]
99+
export JAVA_HOME=[JDK path]
97100
```
98101

99102
<hr>

‎examples/kotlin-matter-controller/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ control Matter accessory devices.
77

88
- [Matter Controller Kotlin App Example](#matter-controller-kotlin-app-example)
99
- [Requirements for building](#requirements-for-building)
10+
- [Linux](#linux)
1011
- [Preparing for build](#preparing-for-build)
11-
- [Building & Running the app](#building--running-the-app)
12+
- [Building \& Running the app](#building--running-the-app)
1213

1314
<hr>
1415

@@ -82,7 +83,7 @@ export PATH="/usr/lib/kotlinc/bin:$PATH"
8283
### Linux
8384

8485
```shell
85-
export JAVA_PATH=[JDK path]
86+
export JAVA_HOME=[JDK path]
8687
```
8788

8889
<hr>

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

+2-2
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-26/android.jar to access BLE items)
170+
# ..../platforms/android-30/android.jar to access BLE items)
171171
}
172172

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

177177
group("default") {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ android_library("java") {
120120
javac_flags = [ "-Xlint:deprecation" ]
121121

122122
# TODO: add classpath support (we likely need to add something like
123-
# ..../platforms/android-26/android.jar to access BLE items)
123+
# ..../platforms/android-30/android.jar to access BLE items)
124124
}
125125

126126
java_prebuilt("android") {
127-
jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
127+
jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
128128
}
129129

130130
group("default") {

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

+2-2
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-26/android.jar to access BLE items)
88+
# ..../platforms/android-30/android.jar to access BLE items)
8989
}
9090

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

9595
group("default") {

‎integrations/cloudbuild/smoke-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ steps:
140140
- name: pwenv
141141
path: /pwenv
142142

143-
- name: "ghcr.io/project-chip/chip-build-vscode:112"
143+
- name: "ghcr.io/project-chip/chip-build-vscode:113"
144144
id: Android
145145
env:
146146
- PW_ENVIRONMENT_ROOT=/pwenv

‎scripts/build/builders/android.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ def validate_build_environment(self):
164164
os.environ["ANDROID_HOME"], "tools", "bin", "sdkmanager"
165165
)
166166

167-
# New SDK manager at cmdline-tools/latest/bin/
167+
# New SDK manager at cmdline-tools/10.0/bin/
168168
new_sdk_manager = os.path.join(
169-
os.environ["ANDROID_HOME"], "cmdline-tools", "latest", "bin", "sdkmanager"
169+
os.environ["ANDROID_HOME"], "cmdline-tools", "10.0", "bin", "sdkmanager"
170170
)
171171
if not (
172172
os.path.isfile(sdk_manager) and os.access(sdk_manager, os.X_OK)
@@ -413,7 +413,7 @@ def generate(self):
413413
new_sdk_manager = os.path.join(
414414
os.environ["ANDROID_HOME"],
415415
"cmdline-tools",
416-
"latest",
416+
"10.0",
417417
"bin",
418418
"sdkmanager",
419419
)

‎scripts/build/builders/host.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ def SysRootPath(self, name):
556556

557557
def generate(self):
558558
super(HostBuilder, self).generate()
559-
if 'JAVA_PATH' in os.environ:
559+
if 'JAVA_HOME' in os.environ:
560560
self._Execute(
561561
["third_party/java_deps/set_up_java_deps.sh"],
562562
title="Setting up Java deps",

‎scripts/build/test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def build_actual_output(root: str, out: str, args: List[str]) -> List[str]:
4747
'NXP_K32W0_SDK_ROOT': 'TEST_NXP_K32W0_SDK_ROOT',
4848
'IMX_SDK_ROOT': 'IMX_SDK_ROOT',
4949
'TI_SYSCONFIG_ROOT': 'TEST_TI_SYSCONFIG_ROOT',
50-
'JAVA_PATH': 'TEST_JAVA_PATH',
50+
'JAVA_HOME': 'TEST_JAVA_HOME',
5151
'GSDK_ROOT': 'TEST_GSDK_ROOT',
5252
'WISECONNECT_SDK_ROOT': 'TEST_WISECONNECT_SDK_ROOT',
5353
'WIFI_SDK_ROOT': 'TEST_WIFI_SDK_ROOT',

‎src/app/server/java/BUILD.gn

+2-2
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-26/android.jar to access BLE items)
77+
# ..../platforms/android-30/android.jar to access BLE items)
7878
}
7979

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

‎src/controller/java/BUILD.gn

+4-4
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ android_library("java") {
679679
]
680680

681681
# TODO: add classpath support (we likely need to add something like
682-
# ..../platforms/android-26/android.jar to access BLE items)
682+
# ..../platforms/android-30/android.jar to access BLE items)
683683
}
684684

685685
if (chip_link_tests) {
@@ -711,7 +711,7 @@ if (chip_link_tests) {
711711
javac_flags = [ "-Xlint:deprecation" ]
712712

713713
# TODO: add classpath support (we likely need to add something like
714-
# ..../platforms/android-26/android.jar to access BLE items)
714+
# ..../platforms/android-30/android.jar to access BLE items)
715715
}
716716

717717
android_library("tests") {
@@ -746,12 +746,12 @@ if (chip_link_tests) {
746746
javac_flags = [ "-Xlint:deprecation" ]
747747

748748
# TODO: add classpath support (we likely need to add something like
749-
# ..../platforms/android-26/android.jar to access BLE items)
749+
# ..../platforms/android-30/android.jar to access BLE items)
750750
}
751751
}
752752

753753
if (!matter_enable_java_compilation) {
754754
java_prebuilt("android") {
755-
jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
755+
jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
756756
}
757757
}

‎src/messaging/tests/java/BUILD.gn

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ android_library("java") {
7979
javac_flags = [ "-Xlint:deprecation" ]
8080

8181
# TODO: add classpath support (we likely need to add something like
82-
# ..../platforms/android-26/android.jar to access BLE items)
82+
# ..../platforms/android-30/android.jar to access BLE items)
8383
}
8484

8585
if (!matter_enable_java_compilation) {
8686
java_prebuilt("android") {
87-
jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
87+
jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
8888
}
8989
}

‎src/platform/android/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,5 @@ android_library("java") {
142142
}
143143

144144
java_prebuilt("android_sdk") {
145-
jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
145+
jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
146146
}

0 commit comments

Comments
 (0)