Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions build/soong/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -138,21 +138,21 @@ vendor_init {
}

soong_config_module_type {
name: "surfaceflinger_fod_lib",
name: "surfaceflinger_udfps_lib",
module_type: "cc_defaults",
config_namespace: "coltGlobalVars",
value_variables: ["target_surfaceflinger_fod_lib"],
value_variables: ["target_surfaceflinger_udfps_lib"],
properties: [
"cppflags",
"whole_static_libs",
],
}

surfaceflinger_fod_lib {
name: "surfaceflinger_fod_lib_defaults",
surfaceflinger_udfps_lib {
name: "surfaceflinger_udfps_lib_defaults",
soong_config_variables: {
target_surfaceflinger_fod_lib: {
cppflags: ["-DTARGET_PROVIDES_FOD_LIB"],
target_surfaceflinger_udfps_lib: {
cppflags: ["-DTARGET_PROVIDES_UDFPS_LIB"],
whole_static_libs: ["%s"],
},
},
Expand Down
6 changes: 3 additions & 3 deletions config/BoardConfigSoong.mk
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ SOONG_CONFIG_coltGlobalVars += \
target_init_vendor_lib \
target_inputdispatcher_skip_event_key \
target_ld_shim_libs \
target_surfaceflinger_fod_lib \
target_surfaceflinger_udfps_lib \
uses_egl_display_array \
uses_oplus_camera \
uses_nothing_camera
Expand Down Expand Up @@ -82,7 +82,7 @@ TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE ?= false
TARGET_INIT_VENDOR_LIB ?= vendor_init
TARGET_INPUTDISPATCHER_SKIP_EVENT_KEY ?= 0
TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY ?= libcamera_parameters
TARGET_SURFACEFLINGER_FOD_LIB ?= surfaceflinger_fod_lib
TARGET_SURFACEFLINGER_UDFPS_LIB ?= surfaceflinger_udfps_lib

# Soong value variables
SOONG_CONFIG_coltGlobalVars_additional_gralloc_10_usage_bits := $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS)
Expand All @@ -91,7 +91,7 @@ SOONG_CONFIG_coltGlobalVars_disable_bluetooth_le_set_host_feature := $(TARGET_DI
SOONG_CONFIG_coltGlobalVars_target_init_vendor_lib := $(TARGET_INIT_VENDOR_LIB)
SOONG_CONFIG_coltGlobalVars_target_inputdispatcher_skip_event_key := $(TARGET_INPUTDISPATCHER_SKIP_EVENT_KEY)
SOONG_CONFIG_coltGlobalVars_target_ld_shim_libs := $(subst $(space),:,$(TARGET_LD_SHIM_LIBS))
SOONG_CONFIG_coltGlobalVars_target_surfaceflinger_fod_lib := $(TARGET_SURFACEFLINGER_FOD_LIB)
SOONG_CONFIG_coltGlobalVars_target_surfaceflinger_udfps_lib := $(TARGET_SURFACEFLINGER_UDFPS_LIB)
SOONG_CONFIG_coltGlobalVars_camera_skip_kind_check := $(TARGET_CAMERA_SKIP_KIND_CHECK)

ifneq ($(filter $(QSSI_SUPPORTED_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)
Expand Down
2 changes: 1 addition & 1 deletion config/version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# ColtOS Versioning System
COLT_MAJOR_VERSION = v13.0
COLT_RELEASE_VERSION = Phoenix
COLT_RELEASE_VERSION = mojito
COLT_BUILD_TYPE ?= Unofficial
COLT_BUILD_MAINTAINER ?= Unknown
COLT_BUILD_ZIP_TYPE := VANILLA
Expand Down