commit 286f1fc8b613c51147a4b91b1832b8fa7952f8cb
author Yongqin Liu <yongqin.liu@linaro.org> Thu Jun 21 22:09:15 2018 +0800
committer Jérôme Forissier <jerome.forissier@linaro.org> Tue Aug 07 11:33:43 2018 +0200
tree 3de1e7d6cbc834024d8e1f2176bfbdbfd158e747
parent 13d805a0bd3f1051e3c6cc48bca4c3a8248ad5f6

Android.mk: make xtest installed in the vendor partition

and use ta libs in the vendor partition,
so that we could make optee work with Treble enabled builds too

Acked-by: Victor Chong <victor.chong@linaro.org>
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

Android.mk

diff --git a/Android.mk b/Android.mk
index ff3c35c..086f500 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,8 +19,11 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := xtest
+LOCAL_VENDOR_MODULE := true
 LOCAL_SHARED_LIBRARIES := libteec
 
+TA_DIR ?= /vendor/lib/optee_armtz
+
 srcs := regression_1000.c
 
 ifeq ($(CFG_GP_SOCKETS),y)
@@ -97,6 +100,10 @@
 LOCAL_CFLAGS += -g3
 LOCAL_CFLAGS += -Wno-missing-field-initializers -Wno-format-zero-length
 
+ifneq ($(TA_DIR),)
+LOCAL_CFLAGS += -DTA_DIR=\"$(TA_DIR)\"
+endif
+
 ## $(OPTEE_BIN) is the path of tee.bin like
 ## out/target/product/hikey/optee/arm-plat-hikey/core/tee.bin
 ## it will be generated after build the optee_os with target BUILD_OPTEE_OS