Merge android-msm-pixel-4.19-sc-qpr1 into android-msm-pixel-4.19

SBMerger: 379283923
Change-Id: Ie2e75bf754bc2c0c13aec29f0f8d082ca3513b1b
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>

2 files changed, 15 insertions, 4 deletions

diff --git a/Kbuild b/Kbuild
index 04453d7..b9ee991 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1,3 +1,5 @@
 obj-$(CONFIG_TOUCHSCREEN_SEC_TS)   += sec_touch.o
-sec_touch-objs   += sec_cmd.o sec_ts.o sec_ts_fw.o sec_ts_fn.o \
-	sec_ts_only_vendor.o
+sec_touch-objs   += sec_cmd.o sec_ts.o sec_ts_fw.o sec_ts_fn.o
+ifneq ($(CONFIG_TOUCHSCREEN_SEC_TS_DEBUG),)
+sec_touch-objs   += sec_ts_only_vendor.o
+endif
diff --git a/sec_ts.h b/sec_ts.h
index 9901d63..387c007 100644
--- a/sec_ts.h
+++ b/sec_ts.h
@@ -1131,10 +1131,19 @@ int sec_ts_read_raw_data(struct sec_ts_data *ts,
 		struct sec_cmd_data *sec, struct sec_ts_test_mode *mode);
 u8 sec_ts_run_cal_check(struct sec_ts_data *ts);
 
-#if (1)//!defined(CONFIG_SAMSUNG_PRODUCT_SHIP)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_SEC_TS_DEBUG)
 int sec_ts_raw_device_init(struct sec_ts_data *ts);
-#endif
 void sec_ts_raw_device_exit(struct sec_ts_data *ts);
+#else
+static inline int sec_ts_raw_device_init(struct sec_ts_data *ts)
+{
+	return 0;
+}
+
+static inline void sec_ts_raw_device_exit(struct sec_ts_data *ts)
+{
+}
+#endif
 
 extern struct class *sec_class;