xtest: combine aes_perf and hash_perf TAs into crypto_perf
There is quite a bit of copy in these files. So, I consolidate the
code to make it easier to maintain.
Signed-off-by: Zexi Yu <yuzexi@hisilicon.com>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
[jf: edit commit subject, fix whitespace in ta_crypto_perf_priv.h]
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@foss.st.com>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
diff --git a/Android.mk b/Android.mk
index 6ae8735..0ceb594 100644
--- a/Android.mk
+++ b/Android.mk
@@ -108,8 +108,7 @@
$(LOCAL_PATH)/ta/storage_benchmark/include \
$(LOCAL_PATH)/ta/concurrent/include \
$(LOCAL_PATH)/ta/concurrent_large/include \
- $(LOCAL_PATH)/ta/hash_perf/include \
- $(LOCAL_PATH)/ta/aes_perf/include \
+ $(LOCAL_PATH)/ta/crypto_perf/include \
$(LOCAL_PATH)/ta/socket/include \
$(LOCAL_PATH)/ta/sdp_basic/include \
$(LOCAL_PATH)/ta/tpm_log_test/include \