You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by ms...@apache.org on 2021/09/08 03:40:39 UTC
[incubator-teaclave-trustzone-sdk] branch master updated: change
optee-teec to use dynamic optee_client library (#39)
This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
The following commit(s) were added to refs/heads/master by this push:
new 03cfbb2 change optee-teec to use dynamic optee_client library (#39)
03cfbb2 is described below
commit 03cfbb245cdd16a65f2ea5884ed4830e56f2e88c
Author: BruceFan <fa...@baidu.com>
AuthorDate: Wed Sep 8 11:40:33 2021 +0800
change optee-teec to use dynamic optee_client library (#39)
---
environment | 2 +-
optee-teec/optee-teec-sys/build.rs | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/environment b/environment
index 4168101..e47886d 100644
--- a/environment
+++ b/environment
@@ -22,7 +22,7 @@ then
export OPTEE_DIR="$(pwd)/optee"
fi
export OPTEE_OS_DIR="$OPTEE_DIR/optee_os"
-export OPTEE_CLIENT_DIR="$OPTEE_DIR/optee_client"
+export OPTEE_CLIENT_DIR="$OPTEE_DIR/optee_client/out"
export OPTEE_CLIENT_INCLUDE="$OPTEE_DIR/optee_client/out/export/usr/include"
if [ "$ARCH" = "arm" ]
then
diff --git a/optee-teec/optee-teec-sys/build.rs b/optee-teec/optee-teec-sys/build.rs
index 180de8c..2d8fc42 100644
--- a/optee-teec/optee-teec-sys/build.rs
+++ b/optee-teec/optee-teec-sys/build.rs
@@ -19,8 +19,8 @@ use std::env;
use std::path::Path;
fn main() {
- let optee_client_dir = env::var("OPTEE_CLIENT_DIR").unwrap_or("../../optee/optee_client".to_string());
- let search_path = Path::new(&optee_client_dir).join("out/export/usr/lib");
+ let optee_client_dir = env::var("OPTEE_CLIENT_DIR").unwrap_or("../../optee/optee_client/out".to_string());
+ let search_path = Path::new(&optee_client_dir).join("libteec");
println!("cargo:rustc-link-search={}", search_path.display());
- println!("cargo:rustc-link-lib=static=teec");
+ println!("cargo:rustc-link-lib=dylib=teec");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org