فهرست منبع

datarmnet: Change featurized flags for trace paths

Kbuild flag for LE based target was not being picked up
by cflags as expected, but as an unintended consequence
when rmnet_shs would try to include rmnet_trace.h,
the LE flag which wasn't used to build the rmnet_core.ko
was seen as unheard of causing compilation issue. To
get around this constraint, we are instead changing
the featurization flags in rmnet_trace.h to filter
by kernel version first for LE targets, and then
from there filtering by target name specifically.

Change-Id: I0f9a40f2ed7bfacc492cf2bb99b816c86ec710ed
Signed-off-by: Conner Huff <[email protected]>
Conner Huff 4 سال پیش
والد
کامیت
a0cff4ae40
1فایلهای تغییر یافته به همراه5 افزوده شده و 3 حذف شده
  1. 5 3
      core/rmnet_trace.h

+ 5 - 3
core/rmnet_trace.h

@@ -1,18 +1,20 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
  */
-
+#include <linux/version.h>
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM rmnet
 #undef TRACE_INCLUDE_PATH
 #define TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/datarmnet/core
 #ifdef RMNET_LA_PLATFORM
 #define TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/datarmnet/core
-#elif RMNET_TRACE_INCLUDE_LE
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
+#ifdef CONFIG_ARCH_SDXNIGHTJAR
 #define TRACE_INCLUDE_PATH ../../../../../../../datarmnet/core
 #else
 #define TRACE_INCLUDE_PATH ../../../../../../../src/datarmnet/core
-#endif
+#endif /* endif LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0) */
+#endif /* endif RMNET_LA_PLATFORM */
 #define TRACE_INCLUDE_FILE rmnet_trace
 
 #if !defined(_TRACE_RMNET_H) || defined(TRACE_HEADER_MULTI_READ)