tdk: change vendor/amlogic to BOARD_AML_VENDOR_PATH [24/24]

PD# 157360

change vendor/amlogic to BOARD_AML_VENDOR_PATH

Change-Id: Idd02170268fa7026ade8be7c6f01cd5ca483e683

17 files changed, 18 insertions, 18 deletions

diff --git a/aosp_optee.mk b/aosp_optee.mk
index b75d528..1e5e42a 100644
--- a/aosp_optee.mk
+++ b/aosp_optee.mk
@@ -11,10 +11,10 @@ CROSS_COMPILE_LINE := CROSS_COMPILE=$(OPTEE_CROSS_COMPILE)
 OPTEE_TA_OUT_DIR ?= $(PRODUCT_OUT)/optee/ta
 
 TOP_ROOT_ABS := $(realpath $(TOP))
-TA_DEV_KIT_DIR := vendor/amlogic/tdk/ta_export
+TA_DEV_KIT_DIR := $(BOARD_AML_VENDOR_PATH)/tdk/ta_export
 
 ifeq ($(TARGET_ENABLE_TA_SIGN), true)
-TDK_PATH := $(TOP_ROOT_ABS)/vendor/amlogic/tdk
+TDK_PATH := $(TOP_ROOT_ABS)/$(BOARD_AML_VENDOR_PATH)/tdk
 TA_SIGN_AUTO_TOOL := $(TDK_PATH)/ta_export/scripts/sign_ta_auto.py
 endif
 
diff --git a/demos/hello_world/ta/Android.mk b/demos/hello_world/ta/Android.mk
index 6fa7c49..cda6036 100644
--- a/demos/hello_world/ta/Android.mk
+++ b/demos/hello_world/ta/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := 8aaaf200-2450-11e4-abe2-0002a5d5c51b.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/aes_perf/Android.mk b/demos/optee_test/ta/aes_perf/Android.mk
index 4aa9fe3..c83bb12 100644
--- a/demos/optee_test/ta/aes_perf/Android.mk
+++ b/demos/optee_test/ta/aes_perf/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := e626662e-c0e2-485c-b8c8-09fbce6edf3d.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/concurrent/Android.mk b/demos/optee_test/ta/concurrent/Android.mk
index c1032eb..7232b16 100644
--- a/demos/optee_test/ta/concurrent/Android.mk
+++ b/demos/optee_test/ta/concurrent/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := e13010e0-2ae1-11e5-896a-0002a5d5c51b.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/concurrent_large/Android.mk b/demos/optee_test/ta/concurrent_large/Android.mk
index 45ee7b8..af599a3 100644
--- a/demos/optee_test/ta/concurrent_large/Android.mk
+++ b/demos/optee_test/ta/concurrent_large/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := 5ce0c432-0ab0-40e5-a056-782ca0e6aba2.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/create_fail_test/Android.mk b/demos/optee_test/ta/create_fail_test/Android.mk
index 1b28be5..1105fb5 100644
--- a/demos/optee_test/ta/create_fail_test/Android.mk
+++ b/demos/optee_test/ta/create_fail_test/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := c3f6e2c0-3548-11e1-b86c-0800200c9a66.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/crypt/Android.mk b/demos/optee_test/ta/crypt/Android.mk
index fd7c7c1..9fefcaa 100644
--- a/demos/optee_test/ta/crypt/Android.mk
+++ b/demos/optee_test/ta/crypt/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := cb3e5ba0-adf1-11e0-998b-0002a5d5c51b.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/os_test/Android.mk b/demos/optee_test/ta/os_test/Android.mk
index b50caa7..a3a6cbc 100644
--- a/demos/optee_test/ta/os_test/Android.mk
+++ b/demos/optee_test/ta/os_test/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := 5b9e0e40-2636-11e1-ad9e-0002a5d5c51b.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/rpc_test/Android.mk b/demos/optee_test/ta/rpc_test/Android.mk
index 3322ea3..c1880f9 100644
--- a/demos/optee_test/ta/rpc_test/Android.mk
+++ b/demos/optee_test/ta/rpc_test/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := d17f73a0-36ef-11e1-984a-0002a5d5c51b.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/sdp_basic/Android.mk b/demos/optee_test/ta/sdp_basic/Android.mk
index 8b3d75e..0e1037d 100644
--- a/demos/optee_test/ta/sdp_basic/Android.mk
+++ b/demos/optee_test/ta/sdp_basic/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := 12345678-5b69-11e4-9dbb-101f74f00099.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/sha_perf/Android.mk b/demos/optee_test/ta/sha_perf/Android.mk
index 9bbc982..e6abd79 100644
--- a/demos/optee_test/ta/sha_perf/Android.mk
+++ b/demos/optee_test/ta/sha_perf/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := 614789f2-39c0-4ebf-b235-92b32ac107ed.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/sims/Android.mk b/demos/optee_test/ta/sims/Android.mk
index fdd2108..dbfc55d 100644
--- a/demos/optee_test/ta/sims/Android.mk
+++ b/demos/optee_test/ta/sims/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := e6a33ed4-562b-463a-bb7e-ff5e15a493c8.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/socket/Android.mk b/demos/optee_test/ta/socket/Android.mk
index 294f65a..663d435 100644
--- a/demos/optee_test/ta/socket/Android.mk
+++ b/demos/optee_test/ta/socket/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := 873bcd08-c2c3-11e6-a937-d0bf9c45c61c.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/storage/Android.mk b/demos/optee_test/ta/storage/Android.mk
index 0516078..d0046f2 100644
--- a/demos/optee_test/ta/storage/Android.mk
+++ b/demos/optee_test/ta/storage/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := b689f2a7-8adf-477a-9f99-32e90c0ad0a2.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/storage2/Android.mk b/demos/optee_test/ta/storage2/Android.mk
index fa3dde2..9e72480 100644
--- a/demos/optee_test/ta/storage2/Android.mk
+++ b/demos/optee_test/ta/storage2/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := 731e279e-aafb-4575-a771-38caa6f0cca6.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/demos/optee_test/ta/storage_benchmark/Android.mk b/demos/optee_test/ta/storage_benchmark/Android.mk
index d036c8b..6648d91 100644
--- a/demos/optee_test/ta/storage_benchmark/Android.mk
+++ b/demos/optee_test/ta/storage_benchmark/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-TDK_PATH := $(realpath $(TOP))/vendor/amlogic/tdk
+TDK_PATH := $(realpath $(TOP))/$(BOARD_AML_VENDOR_PATH)/tdk
 local_module := f157cda0-550c-11e5-a6fa-0002a5d5c51b.ta
 # This overrides the path of the output artifact so it won't be
 # included into the system image
diff --git a/linuxdriver/Android.mk b/linuxdriver/Android.mk
index 7ede93d..a970928 100644
--- a/linuxdriver/Android.mk
+++ b/linuxdriver/Android.mk
@@ -18,7 +18,7 @@ $(info $(shell if [ ! -e $(KERNEL_OUT_DIR)/include/generated/autoconf.h ]; then
 
 $(info $(shell if [ ! -e $(KERNEL_OUT_DIR)/include/generated/autoconf.h ]; then $(MAKE) -C $(KERNEL_DIR) O=../$(KERNEL_OUT_DIR) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) modules_prepare; fi))
 
-$(info $(shell $(MAKE) -C $(shell pwd)/$(KERNEL_OUT_DIR) M=$(shell pwd)/vendor/amlogic/tdk/linuxdriver/ ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) modules))
+$(info $(shell $(MAKE) -C $(shell pwd)/$(KERNEL_OUT_DIR) M=$(shell pwd)/$(BOARD_AML_VENDOR_PATH)/tdk/linuxdriver/ ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) modules))
 
 $(info $(shell mkdir -p $(PRODUCT_OUT)/obj/lib))
 $(info $(shell cp -vf $(LOCAL_PATH)/optee/optee_armtz.ko $(PRODUCT_OUT)/obj/lib))