From cac00bd15ac7b8c9e5ba79f12165c709d696b29d Mon Sep 17 00:00:00 2001
From: Ananth Sadvi Bogavalli <quic_abogaval@quicinc.com>
Date: Sat, 23 Sep 2023 21:07:49 +0530
Subject: [PATCH] securemsm-kernel: Update hardcoded paths

Updating the hardcoded path to store into a variable to support
multiple vendor components in parallel for build compilations.

Tests:
Compilation validation and device is booting up successfully.

Change-Id: I6a058e538a5050066de0737b834ec182c1283fc3
Signed-off-by: Ananth Sadvi Bogavalli <quic_abogaval@quicinc.com>
---
 Android.mk                  | 8 ++++++--
 smcinvoke/trace_smcinvoke.h | 5 +----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Android.mk b/Android.mk
index a70384d8c5..9fcef442af 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,9 +13,13 @@ ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
 endif
 
 LOCAL_PATH := $(call my-dir)
-DLKM_DIR := $(TOP)/device/qcom/common/dlkm
 
-SEC_KERNEL_DIR := $(TOP)/vendor/qcom/opensource/securemsm-kernel
+VENDOR_OPENSOURCE_DIR ?= vendor/qcom/opensource
+VENDOR_COMMON_DIR ?= device/qcom/common
+
+DLKM_DIR := $(TOP)/$(VENDOR_COMMON_DIR)/dlkm
+
+SEC_KERNEL_DIR := $(TOP)/$(VENDOR_OPENSOURCE_DIR)/securemsm-kernel
 
 LOCAL_EXPORT_KO_INCLUDE_DIRS := $(LOCAL_PATH)/include/ \
                                 $(LOCAL_PATH)/include/uapi
diff --git a/smcinvoke/trace_smcinvoke.h b/smcinvoke/trace_smcinvoke.h
index 45ba356382..313fb81774 100644
--- a/smcinvoke/trace_smcinvoke.h
+++ b/smcinvoke/trace_smcinvoke.h
@@ -7,10 +7,7 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM smcinvoke
 
-#undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE trace_smcinvoke
-
-#if !defined(_TRACE_SMCINVOKE) || defined(TRACE_HEADER_MULTI_READ)
+#if !defined(_TRACE_SMCINVOKE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SMCINVOKE_H
 #include <linux/types.h>
 #include <linux/tracepoint.h>