StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

config: Move vendor_init lib to select()

Browse Source 
Change-Id: Iccda5ad6d1c37a63ff7959bd3887e120ad403d5c
This commit is contained in:
Michael Bestas
2025-04-25 00:09:31 +03:00
committed by Bruno Martins
parent f12b53506a
commit 712c75560f
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
build/soong/Android.bp
View File

@@ -111,23 +111,6 @@ gralloc_10_usage_bits {
}, },
} }
soong_config_module_type {
name: "vendor_init",
module_type: "cc_defaults",
config_namespace: "lineageGlobalVars",
value_variables: ["target_init_vendor_lib"],
properties: ["whole_static_libs"],
}
vendor_init {
name: "vendor_init_defaults",
soong_config_variables: {
target_init_vendor_lib: {
whole_static_libs: ["%s"],
},
},
}
soong_config_module_type { soong_config_module_type {
name: "trust_usb_control", name: "trust_usb_control",
module_type: "cc_defaults", module_type: "cc_defaults",

8
config/BoardConfigSoong.mk
View File

@@ -31,7 +31,6 @@ SOONG_CONFIG_lineageGlobalVars += \
additional_gralloc_10_usage_bits \ additional_gralloc_10_usage_bits \
bootloader_message_offset \ bootloader_message_offset \
camera_override_format_from_reserved \ camera_override_format_from_reserved \
target_init_vendor_lib \
target_trust_usb_control_path \ target_trust_usb_control_path \
target_trust_usb_control_enable \ target_trust_usb_control_enable \
target_trust_usb_control_disable target_trust_usb_control_disable
@@ -43,7 +42,6 @@ SOONG_CONFIG_lineageGlobalVars_camera_override_format_from_reserved := $(TARGET_
BOOTLOADER_MESSAGE_OFFSET ?= 0 BOOTLOADER_MESSAGE_OFFSET ?= 0
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0 TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0
TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED ?= false TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED ?= false
TARGET_INIT_VENDOR_LIB ?= vendor_init
TARGET_TRUST_USB_CONTROL_PATH ?= /proc/sys/kernel/deny_new_usb TARGET_TRUST_USB_CONTROL_PATH ?= /proc/sys/kernel/deny_new_usb
TARGET_TRUST_USB_CONTROL_ENABLE ?= 1 TARGET_TRUST_USB_CONTROL_ENABLE ?= 1
TARGET_TRUST_USB_CONTROL_DISABLE ?= 0 TARGET_TRUST_USB_CONTROL_DISABLE ?= 0
@@ -51,7 +49,6 @@ TARGET_TRUST_USB_CONTROL_DISABLE ?= 0
# Soong value variables # Soong value variables
SOONG_CONFIG_lineageGlobalVars_additional_gralloc_10_usage_bits := $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS) SOONG_CONFIG_lineageGlobalVars_additional_gralloc_10_usage_bits := $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS)
SOONG_CONFIG_lineageGlobalVars_bootloader_message_offset := $(BOOTLOADER_MESSAGE_OFFSET) SOONG_CONFIG_lineageGlobalVars_bootloader_message_offset := $(BOOTLOADER_MESSAGE_OFFSET)
SOONG_CONFIG_lineageGlobalVars_target_init_vendor_lib := $(TARGET_INIT_VENDOR_LIB)
SOONG_CONFIG_lineageGlobalVars_target_trust_usb_control_path := $(TARGET_TRUST_USB_CONTROL_PATH) SOONG_CONFIG_lineageGlobalVars_target_trust_usb_control_path := $(TARGET_TRUST_USB_CONTROL_PATH)
SOONG_CONFIG_lineageGlobalVars_target_trust_usb_control_enable := $(TARGET_TRUST_USB_CONTROL_ENABLE) SOONG_CONFIG_lineageGlobalVars_target_trust_usb_control_enable := $(TARGET_TRUST_USB_CONTROL_ENABLE)
SOONG_CONFIG_lineageGlobalVars_target_trust_usb_control_disable := $(TARGET_TRUST_USB_CONTROL_DISABLE) SOONG_CONFIG_lineageGlobalVars_target_trust_usb_control_disable := $(TARGET_TRUST_USB_CONTROL_DISABLE)
@@ -102,3 +99,8 @@ endif
ifneq ($(TARGET_SURFACEFLINGER_UDFPS_LIB),) ifneq ($(TARGET_SURFACEFLINGER_UDFPS_LIB),)
$(call soong_config_set,surfaceflinger,udfps_lib,$(TARGET_SURFACEFLINGER_UDFPS_LIB)) $(call soong_config_set,surfaceflinger,udfps_lib,$(TARGET_SURFACEFLINGER_UDFPS_LIB))
endif endif
# Vendor init
ifneq ($(TARGET_INIT_VENDOR_LIB),)
$(call soong_config_set,libinit,vendor_init_lib,$(TARGET_INIT_VENDOR_LIB))
endif