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
20 changes: 12 additions & 8 deletions build/soong/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,22 @@ cc_library_headers {

// Target platform agnostic config modules
soong_config_module_type {
name: "camera_needs_client_info",
name: "camera_needs_client_info_lib",
module_type: "cc_defaults",
config_namespace: "customGlobalVars",
bool_variables: ["camera_needs_client_info"],
properties: ["cppflags"],
config_namespace: "lineageGlobalVars",
bool_variables: ["camera_needs_client_info_lib"],
properties: [
"cppflags",
"shared_libs",
],
}

camera_needs_client_info {
name: "camera_needs_client_info_defaults",
camera_needs_client_info_lib {
name: "camera_needs_client_info_lib_defaults",
soong_config_variables: {
camera_needs_client_info: {
cppflags: ["-DCAMERA_NEEDS_CLIENT_INFO"],
camera_needs_client_info_lib: {
cppflags: ["-DCAMERA_NEEDS_CLIENT_INFO_LIB"],
shared_libs: ["//device/oneplus/common:[email protected]"],
},
},
}
Expand Down
4 changes: 2 additions & 2 deletions config/BoardConfigSoong.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ SOONG_CONFIG_NAMESPACES += lineageGlobalVars
SOONG_CONFIG_lineageGlobalVars += \
additional_gralloc_10_usage_bits \
bootloader_message_offset \
camera_needs_client_info \
camera_needs_client_info_lib \
disable_postrender_cleanup \
has_legacy_camera_hal1 \
has_memfd_backport \
Expand Down Expand Up @@ -65,7 +65,7 @@ SOONG_CONFIG_lineageQcomVars += \
endif

# Soong bool variables
SOONG_CONFIG_lineageGlobalVars_camera_needs_client_info := $(TARGET_CAMERA_NEEDS_CLIENT_INFO)
SOONG_CONFIG_lineageGlobalVars_camera_needs_client_info_lib := $(TARGET_CAMERA_NEEDS_CLIENT_INFO_LIB)
SOONG_CONFIG_lineageGlobalVars_disable_postrender_cleanup := $(TARGET_DISABLE_POSTRENDER_CLEANUP)
SOONG_CONFIG_lineageGlobalVars_has_legacy_camera_hal1 := $(TARGET_HAS_LEGACY_CAMERA_HAL1)
SOONG_CONFIG_lineageGlobalVars_has_memfd_backport := $(TARGET_HAS_MEMFD_BACKPORT)
Expand Down
11 changes: 11 additions & 0 deletions config/common_full_tablet.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Inherit full common Lineage stuff
$(call inherit-product, vendor/lineage/config/common_full.mk)

# Required packages
PRODUCT_PACKAGES += \
LatinIME

# Include Lineage LatinIME dictionaries
PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries

$(call inherit-product, vendor/lineage/config/telephony.mk)
8 changes: 8 additions & 0 deletions config/common_mini_tablet.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Inherit mini common Lineage stuff
$(call inherit-product, vendor/lineage/config/common_mini.mk)

# Required packages
PRODUCT_PACKAGES += \
LatinIME

$(call inherit-product, vendor/lineage/config/telephony.mk)