Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tizen] Fix build with non-default toolchain #26475

Merged
merged 3 commits into from
May 10, 2023
Merged

[Tizen] Fix build with non-default toolchain #26475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3468526
[Tizen] Fix build with non-default toolchain
arkq May 10, 2023
44258cb
Add toolchain to Tizen check target
arkq May 10, 2023
0c826f1
Include Tizen check only if BLE is disabled
arkq May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,10 +677,14 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
if (enable_tizen_builds) {
group("check:tizen") {
testonly = true
deps = [ "${chip_root}/src/test_driver/tizen/integration-tests:check" ]
deps = [ "${chip_root}/src/test_driver/tizen:check(${chip_root}/build/toolchain/tizen:tizen_arm)" ]
}

extra_check_deps += [ ":check:tizen" ]
# Include Tizen check target only if BLE is not enabled, since
# currently, QEMU-based Tizen does not support Bluetooth.
if (!chip_config_network_layer_ble) {
extra_check_deps += [ ":check:tizen" ]
}
}

if (enable_mw320_shell_build) {
Expand Down
4 changes: 2 additions & 2 deletions src/test_driver/tizen/integration_tests/lighting-app/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ tizen_qemu_mkisofs("test-runner") {

# Use artifacts created by the dependencies.
assets = [
rebase_path("${root_build_dir}/chip-tool"),
rebase_path("${root_out_dir}/chip-tool"),
rebase_path(
"${root_build_dir}/org.tizen.matter.example.lighting/out/org.tizen.matter.example.lighting-1.0.0.tpk"),
"${root_out_dir}/org.tizen.matter.example.lighting/out/org.tizen.matter.example.lighting-1.0.0.tpk"),
]
}

Expand Down
14 changes: 7 additions & 7 deletions third_party/tizen/tizen_sdk.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ template("tizen_sdk_certificate") {
assert(defined(invoker.sign_security_profile),
"It is required to specify a `sign_security_profile` which " +
"should be added to Tizen security profiles.")
stamp_file = "${root_build_dir}/.tizen_sdk_dev_certificate_stamp"
stamp_file = "${root_out_dir}/.tizen_sdk_dev_certificate_stamp"
action(target_name) {
forward_variables_from(invoker, [ "deps" ])
script = tizen_dev_certificate
Expand All @@ -91,7 +91,7 @@ template("tizen_sdk_certificate") {
"--author-certificate-email=" + invoker.author_certificate_email,
"--author-certificate-password=" + invoker.author_certificate_password,
"--sign-security-profile=" + invoker.sign_security_profile,
"--stamp-file=" + stamp_file,
"--stamp-file=" + rebase_path(stamp_file),
]
outputs = [ stamp_file ]
}
Expand All @@ -112,7 +112,7 @@ template("tizen_sdk_package") {

# Extract data from Tizen XML manifest.
manifest = exec_script(tizen_manifest_parser,
[ rebase_path(invoker.manifest, root_build_dir) ],
[ rebase_path(invoker.manifest) ],
"json")
manifest_package = manifest["package"]
manifest_package_name = manifest_package["name"]
Expand All @@ -123,7 +123,7 @@ template("tizen_sdk_package") {
# for this, because Tizen Studio CLI scans "res" (resources), "shared" and
# "lib" directories for items to pack. In our case it could include in the
# TPK package libraries available in ${root_out_dir}/lib directory.
tizen_package_dir = "${root_build_dir}/${manifest_package_name}"
tizen_package_dir = "${root_out_dir}/${manifest_package_name}"
tizen_package_out_dir = "${tizen_package_dir}/out"

# Copy Tizen manifest from the source directory.
Expand Down Expand Up @@ -160,7 +160,7 @@ template("tizen_sdk_package") {
"--sign",
invoker.sign_security_profile,
"--",
tizen_package_out_dir,
rebase_path(tizen_package_out_dir),
]
}
}
Expand Down Expand Up @@ -192,7 +192,7 @@ template("tizen_qemu_mkisofs") {
"-JRU", # Joliet + Rock Ridge with untranslated filenames
"-o",
rebase_path(image_file),
rebase_path(invoker.runner, root_build_dir),
rebase_path(invoker.runner),
]
if (defined(invoker.assets)) {
args += invoker.assets
Expand All @@ -216,7 +216,7 @@ template("tizen_qemu_run") {
"It is required to specify ISO runner image.")

# Store QEMU output in a dedicated log file.
output_log_file = "${root_build_dir}/tizen-qemu-" + target_name + ".log"
output_log_file = "${root_out_dir}/tizen-qemu-" + target_name + ".log"

action(target_name) {
forward_variables_from(invoker, [ "deps" ])
Expand Down