Use bazel-made key_xor_test_app

BUG: 352277096 Change-Id: I6c113eb96111c93b0883d3f8ffd0e7963cb47c87
project-oak · Oct 30, 2024 · aeefd39 · aeefd39
1 parent a9df0ec
commit aeefd39
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/buildconfigs/key_xor_test_app.sh b/buildconfigs/key_xor_test_app.sh
@@ -17,5 +17,5 @@ export BUILD_COMMAND=(
 )
 
 export SUBJECT_PATHS=(
-  enclave_apps/target/x86_64-unknown-none/release/key_xor_test_app
+  artifacts/enclave_apps/key_xor_test_app
 )
diff --git a/justfile b/justfile
@@ -31,19 +31,24 @@ show-bazel-flag:
 export CARGO_WORKSPACE_LIST_CMD := 'grep -l "\[workspace" **/Cargo.toml --exclude="third_party/*"'
 export CARGO_LOCKFILES_LIST_CMD := 'find . -name "Cargo*.lock"'
 
-key_xor_test_app: (build_enclave_app "key_xor_test_app")
 oak_echo_enclave_app: (build_enclave_app "oak_echo_enclave_app")
 oak_echo_raw_enclave_app: (build_enclave_app "oak_echo_raw_enclave_app")
 oak_multi_process_test: (build_enclave_app "oak_multi_process_test")
 oak_functions_enclave_app: (build_enclave_app "oak_functions_enclave_app")
 oak_orchestrator: (build_enclave_app "oak_orchestrator")
 
-all_enclave_apps: key_xor_test_app oak_echo_enclave_app oak_echo_raw_enclave_app oak_functions_enclave_app oak_functions_insecure_enclave_app oak_orchestrator
+all_enclave_apps: build_key_xor_test_app oak_echo_enclave_app oak_echo_raw_enclave_app oak_functions_enclave_app oak_functions_insecure_enclave_app oak_orchestrator
 
 # Build a single enclave app, given its name.
 build_enclave_app name:
     env --chdir=enclave_apps/{{name}} cargo build --release
 
+build_key_xor_test_app:
+    bazel build //enclave_apps/key_xor_test_app
+    mkdir --parents artifacts/enclave_apps/
+    cp -f bazel-bin/enclave_apps/key_xor_test_app/key_xor_test_app artifacts/enclave_apps/
+
+
 oak_functions_insecure_enclave_app:
     env --chdir=enclave_apps/oak_functions_enclave_app cargo build --release --no-default-features --features=allow_sensitive_logging
 

diff --git a/kokoro/build_binaries_rust.sh b/kokoro/build_binaries_rust.sh
@@ -21,7 +21,7 @@ touch "${KOKORO_ARTIFACTS_DIR}/binaries/git_commit_${KOKORO_GIT_COMMIT_oak:?}"
 # Copy the generated binaries to Placer. The timestamps are used to convey
 # the creation time.
 readonly generated_binaries=(
-    enclave_apps/target/x86_64-unknown-none/release/key_xor_test_app
+    artifacts/enclave_apps/key_xor_test_app
     generated/client_app.apk
     enclave_apps/target/x86_64-unknown-none/release/oak_echo_enclave_app
     enclave_apps/target/x86_64-unknown-none/release/oak_echo_raw_enclave_app