From cab4afd2f144237c9108328250e4b95ffc109cf6 Mon Sep 17 00:00:00 2001
From: Arian <arian.kulmer@web.de>
Date: Thu, 24 Feb 2022 18:40:09 +0100
Subject: [PATCH] sm8350-common: vibrator: Make the usage of effect stream
 optional

Change-Id: I45f15112b16b04a9a012bf26e366aaebaa3a3bef
---
 BoardConfigCommon.mk     |  6 ++++++
 vibrator/aidl/Android.bp | 27 ++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 073c306..3cd78ec 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -180,6 +180,12 @@ BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private
 BOARD_PLAT_PUBLIC_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/public
 BOARD_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 
+# Soong
+SOONG_CONFIG_NAMESPACES += xiaomiSm8350Vars
+SOONG_CONFIG_xiaomiSm8350Vars += \
+    vibrator_use_effect_stream
+SOONG_CONFIG_xiaomiSm8350Vars_vibrator_use_effect_stream ?= false
+
 # Verified Boot
 BOARD_AVB_ENABLE := true
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3
diff --git a/vibrator/aidl/Android.bp b/vibrator/aidl/Android.bp
index d2b6489..837bbf6 100644
--- a/vibrator/aidl/Android.bp
+++ b/vibrator/aidl/Android.bp
@@ -1,8 +1,34 @@
 Common_CFlags = ["-Wall"]
 Common_CFlags += ["-Werror"]
 
+soong_config_module_type {
+    name: "vibrator_effect_stream",
+    module_type: "cc_defaults",
+    config_namespace: "xiaomiSm8350Vars",
+    bool_variables: ["vibrator_use_effect_stream"],
+    properties: [
+        "cflags",
+        "shared_libs",
+    ],
+}
+
+vibrator_effect_stream {
+    name: "vibrator_effect_stream_defaults",
+    soong_config_variables: {
+        vibrator_use_effect_stream: {
+            cflags: ["-DUSE_EFFECT_STREAM"],
+            shared_libs: [
+                "libqtivibratoreffect",
+            ],
+        },
+    },
+}
+
 cc_library_shared {
     name: "vendor.qti.hardware.vibrator.impl.xiaomi_sm8350",
+    defaults: [
+        "vibrator_effect_stream_defaults",
+    ],
     vendor: true,
     cflags: Common_CFlags,
     srcs: [
@@ -12,7 +38,6 @@ cc_library_shared {
         "libcutils",
         "libutils",
         "liblog",
-        "libqtivibratoreffect",
         "libbinder_ndk",
         "android.hardware.vibrator-ndk_platform",
     ],