From 423b97c4b841b23da89946b0e108c8ac4c19bfc7 Mon Sep 17 00:00:00 2001
From: "wanwei.jiang" <wanwei.jiang@amlogic.com>
Date: Wed, 11 May 2022 22:22:51 +0800
Subject: [PATCH] upgrade: enable NDK_TRIPLE [1/2]

PD#SWPL-80398

Problem:
build fail with NDK_TRIPLE

Solution:
1. modify uapi directory
2. enable NDK_TRIPLE in common git

Verify:
s4d and c2

Change-Id: Ib294877d68b5b061aa8517558ccaf05a93d67cab
Signed-off-by: wanwei.jiang <wanwei.jiang@amlogic.com>
---
 drivers/media/avsync/msync.c                 | 2 +-
 drivers/media/video_sink/video.c             | 2 +-
 drivers/media/video_sink/video_low_latency.c | 2 +-
 include/uapi/{linux => }/amlogic/msync.h     | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/uapi/{linux => }/amlogic/msync.h (100%)

diff --git a/drivers/media/avsync/msync.c b/drivers/media/avsync/msync.c
index 3725e8469..502276c22 100644
--- a/drivers/media/avsync/msync.c
+++ b/drivers/media/avsync/msync.c
@@ -25,7 +25,7 @@
 #include <linux/pid.h>
 #include <linux/amlogic/media/vout/vout_notify.h>
 #include <linux/amlogic/major.h>
-#include <uapi/linux/amlogic/msync.h>
+#include <uapi/amlogic/msync.h>
 #define KERNEL_ATRACE_TAG KERNEL_ATRACE_TAG_MSYNC
 #include <trace/events/meson_atrace.h>
 #include <linux/compat.h>
diff --git a/drivers/media/video_sink/video.c b/drivers/media/video_sink/video.c
index 8ff651b77..c92d38135 100644
--- a/drivers/media/video_sink/video.c
+++ b/drivers/media/video_sink/video.c
@@ -131,7 +131,7 @@ MODULE_AMLOG(LOG_LEVEL_ERROR, 0, LOG_DEFAULT_LEVEL_DESC, LOG_MASK_DESC);
 #define TRACE_INCLUDE_FILE video_trace
 #include <trace/define_trace.h>
 #ifdef CONFIG_AMLOGIC_MEDIA_MSYNC
-#include <uapi/linux/amlogic/msync.h>
+#include <uapi/amlogic/msync.h>
 #endif
 #include "vpp_pq.h"
 
diff --git a/drivers/media/video_sink/video_low_latency.c b/drivers/media/video_sink/video_low_latency.c
index 3ba9c77dd..264da2494 100644
--- a/drivers/media/video_sink/video_low_latency.c
+++ b/drivers/media/video_sink/video_low_latency.c
@@ -58,7 +58,7 @@ MODULE_AMLOG(LOG_LEVEL_ERROR, 0, LOG_DEFAULT_LEVEL_DESC, LOG_MASK_DESC);
 #include "linux/amlogic/media/frame_provider/tvin/tvin_v4l2.h"
 #endif
 #ifdef CONFIG_AMLOGIC_MEDIA_MSYNC
-#include <uapi/linux/amlogic/msync.h>
+#include <uapi/amlogic/msync.h>
 #endif
 #include <linux/amlogic/gki_module.h>
 
diff --git a/include/uapi/linux/amlogic/msync.h b/include/uapi/amlogic/msync.h
similarity index 100%
rename from include/uapi/linux/amlogic/msync.h
rename to include/uapi/amlogic/msync.h