From 6bc8c259308bc729526fb6cd65d577be670a30a6 Mon Sep 17 00:00:00 2001 From: Pig Date: Sat, 19 Sep 2020 08:44:33 +0800 Subject: [PATCH 1/2] config: Setup soong namespaces for TARGET_USE_QTI_BT_STACK To opt-in for QTI BT addons, enable TARGET_USE_QTI_BT_STACK in BoardConfig.mk Reference: [https://github.com/LineageOS/android_vendor_qcom_opensource_bluetooth-commonsys-intf/blob/lineage-18.0/bt-system-opensource-product.mk] Change-Id: I6bf3e1dda6fe5dc66f6fafdb32a1daecb9616c84 --- config/BoardConfigQcom.mk | 6 ++++++ config/BoardConfigSoong.mk | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk index 041c251e..be05f42b 100644 --- a/config/BoardConfigQcom.mk +++ b/config/BoardConfigQcom.mk @@ -99,3 +99,9 @@ PRODUCT_SOONG_NAMESPACES += \ ifeq ($(TARGET_HW_DISK_ENCRYPTION),true) TARGET_CRYPTFS_HW_PATH ?= vendor/qcom/opensource/cryptfs_hw endif + +ifeq ($(TARGET_USE_QTI_BT_STACK),true) +PRODUCT_SOONG_NAMESPACES += \ + vendor/qcom/opensource/commonsys/packages/apps/Bluetooth \ + vendor/qcom/opensource/commonsys/system/bt/conf +endif #TARGET_USE_QTI_BT_STACK diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk index b9f524a1..abfb2d3b 100644 --- a/config/BoardConfigSoong.mk +++ b/config/BoardConfigSoong.mk @@ -59,3 +59,7 @@ SOONG_CONFIG_styxGlobalVars_qcom_display_headers_namespace := vendor/qcom/openso else SOONG_CONFIG_styxGlobalVars_qcom_display_headers_namespace := $(QCOM_SOONG_NAMESPACE)/display endif + +ifneq ($(TARGET_USE_QTI_BT_STACK),true) +PRODUCT_SOONG_NAMESPACES += packages/apps/Bluetooth +endif #TARGET_USE_QTI_BT_STACK From ce4ab10f92816599483ccce296c1bacb6a2d8f97 Mon Sep 17 00:00:00 2001 From: Pig <23kongw@brrice.edu> Date: Sat, 15 Jan 2022 20:15:44 -0500 Subject: [PATCH 2/2] lineage: Add vendor/qcom/opensource/commonsys/system/bt/main to soong ns Add one more product soong namespace to reflect S(QSSI 12) changes Change-Id: I84580b04fd34bad35435753f917694a4dd1cc3b9 --- config/BoardConfigQcom.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk index be05f42b..7cb656dc 100644 --- a/config/BoardConfigQcom.mk +++ b/config/BoardConfigQcom.mk @@ -103,5 +103,6 @@ endif ifeq ($(TARGET_USE_QTI_BT_STACK),true) PRODUCT_SOONG_NAMESPACES += \ vendor/qcom/opensource/commonsys/packages/apps/Bluetooth \ - vendor/qcom/opensource/commonsys/system/bt/conf + vendor/qcom/opensource/commonsys/system/bt/conf \ + vendor/qcom/opensource/commonsys/system/bt/main endif #TARGET_USE_QTI_BT_STACK