summaryrefslogtreecommitdiff
authorPengfei He <pengfei.he@amlogic.com>2017-06-20 09:33:24 (GMT)
committer Peifu Jiang <peifu.jiang@amlogic.com>2017-06-23 01:41:05 (GMT)
commitdce7cbf7486481281f5b359713726c3242c82a63 (patch)
tree35ffa6e0f0752a9f15302b960adb01dc83c868fc
parent9bdb99c9cefe4b4f63aaf3f99f4001d87c27466a (diff)
downloadtdk-dce7cbf7486481281f5b359713726c3242c82a63.zip
tdk-dce7cbf7486481281f5b359713726c3242c82a63.tar.gz
tdk-dce7cbf7486481281f5b359713726c3242c82a63.tar.bz2
demos: fix compiling error in Android 8.0
Change-Id: Ifc601fe043c3ce6470f8a655ec47c58b44c5636b Signed-off-by: Pengfei He <pengfei.he@amlogic.com>
Diffstat
-rw-r--r--demos/hello_world/ta/Android.mk3
-rw-r--r--demos/optee_test/ta/aes_perf/Android.mk3
-rw-r--r--demos/optee_test/ta/concurrent/Android.mk3
-rw-r--r--demos/optee_test/ta/concurrent_large/Android.mk3
-rw-r--r--demos/optee_test/ta/create_fail_test/Android.mk3
-rw-r--r--demos/optee_test/ta/crypt/Android.mk3
-rw-r--r--demos/optee_test/ta/os_test/Android.mk3
-rw-r--r--demos/optee_test/ta/rpc_test/Android.mk3
-rw-r--r--demos/optee_test/ta/sdp_basic/Android.mk3
-rw-r--r--demos/optee_test/ta/sha_perf/Android.mk3
-rw-r--r--demos/optee_test/ta/sims/Android.mk3
-rw-r--r--demos/optee_test/ta/socket/Android.mk3
-rw-r--r--demos/optee_test/ta/storage/Android.mk3
-rw-r--r--demos/optee_test/ta/storage2/Android.mk3
-rw-r--r--demos/optee_test/ta/storage_benchmark/Android.mk3
15 files changed, 15 insertions, 30 deletions
diff --git a/demos/hello_world/ta/Android.mk b/demos/hello_world/ta/Android.mk
index a1b7149..7a77a20 100644
--- a/demos/hello_world/ta/Android.mk
+++ b/demos/hello_world/ta/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/aes_perf/Android.mk b/demos/optee_test/ta/aes_perf/Android.mk
index 15e4873..c00c3f8 100644
--- a/demos/optee_test/ta/aes_perf/Android.mk
+++ b/demos/optee_test/ta/aes_perf/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/concurrent/Android.mk b/demos/optee_test/ta/concurrent/Android.mk
index 2ad8d06..9aa6e19 100644
--- a/demos/optee_test/ta/concurrent/Android.mk
+++ b/demos/optee_test/ta/concurrent/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/concurrent_large/Android.mk b/demos/optee_test/ta/concurrent_large/Android.mk
index 5f80a03..ace9853 100644
--- a/demos/optee_test/ta/concurrent_large/Android.mk
+++ b/demos/optee_test/ta/concurrent_large/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/create_fail_test/Android.mk b/demos/optee_test/ta/create_fail_test/Android.mk
index 7e6a1c5..62c372a 100644
--- a/demos/optee_test/ta/create_fail_test/Android.mk
+++ b/demos/optee_test/ta/create_fail_test/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/crypt/Android.mk b/demos/optee_test/ta/crypt/Android.mk
index d465240..3bbd5cc 100644
--- a/demos/optee_test/ta/crypt/Android.mk
+++ b/demos/optee_test/ta/crypt/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/os_test/Android.mk b/demos/optee_test/ta/os_test/Android.mk
index 0e50aa5..754057f 100644
--- a/demos/optee_test/ta/os_test/Android.mk
+++ b/demos/optee_test/ta/os_test/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/rpc_test/Android.mk b/demos/optee_test/ta/rpc_test/Android.mk
index fad66cd..3e2b9a3 100644
--- a/demos/optee_test/ta/rpc_test/Android.mk
+++ b/demos/optee_test/ta/rpc_test/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/sdp_basic/Android.mk b/demos/optee_test/ta/sdp_basic/Android.mk
index a2f351f..3416ed1 100644
--- a/demos/optee_test/ta/sdp_basic/Android.mk
+++ b/demos/optee_test/ta/sdp_basic/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/sha_perf/Android.mk b/demos/optee_test/ta/sha_perf/Android.mk
index 2ffd46e..a6c3a3b 100644
--- a/demos/optee_test/ta/sha_perf/Android.mk
+++ b/demos/optee_test/ta/sha_perf/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/sims/Android.mk b/demos/optee_test/ta/sims/Android.mk
index 1572200..156fa77 100644
--- a/demos/optee_test/ta/sims/Android.mk
+++ b/demos/optee_test/ta/sims/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/socket/Android.mk b/demos/optee_test/ta/socket/Android.mk
index ec87e5f..d152635 100644
--- a/demos/optee_test/ta/socket/Android.mk
+++ b/demos/optee_test/ta/socket/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/storage/Android.mk b/demos/optee_test/ta/storage/Android.mk
index 7cf4670..899e918 100644
--- a/demos/optee_test/ta/storage/Android.mk
+++ b/demos/optee_test/ta/storage/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/storage2/Android.mk b/demos/optee_test/ta/storage2/Android.mk
index 523599d..42bbe8f 100644
--- a/demos/optee_test/ta/storage2/Android.mk
+++ b/demos/optee_test/ta/storage2/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
diff --git a/demos/optee_test/ta/storage_benchmark/Android.mk b/demos/optee_test/ta/storage_benchmark/Android.mk
index 0a12580..a4b0b24 100644
--- a/demos/optee_test/ta/storage_benchmark/Android.mk
+++ b/demos/optee_test/ta/storage_benchmark/Android.mk
@@ -11,8 +11,7 @@ $(info $(shell make CROSS_COMPILE=$(TA_CROSS_COMPILE) -C $(LOCAL_PATH) O=$(OUTPU
$(info $(shell if [ ! -e $(TA_EXPORT_DIR) ]; then mkdir -p $(TA_EXPORT_DIR); fi))
-ta_file := $(wildcard $(OUTPUT_DIR)/*.ta)
-ta_file := $(patsubst $(OUTPUT_DIR)/%,%,$(ta_file))
+ta_file := $(OUTPUT_DIR)/$(TA_BINARY).ta
ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY), true)
$(info $(shell $(TA_GEN_CERT_TOOL) --root_rsa_key=$(TA_ROOT_PRIV_KEY) \
generated by cgit at 2024-05-18 20:42:38 (GMT)