From 6d9bfc339c0ea9f582940d2be0537617cc1385c0 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Fri, 11 Mar 2022 12:10:45 +0000 Subject: [PATCH 1/2] config: Create makefiles for tablets with telephony support So far, tablets with telephony have been inheriting from common_full_phone.mk, but that's not really proper because such makefile now enables one-handed mode support (setting prop ro.support_one_handed_mode to true). Fix this by creating new makefiles that can be used also to include more tablet-specific configs moving forward. Change-Id: I90c22badb17911ef5e873299d986204718300e6c --- config/common_full_tablet.mk | 11 +++++++++++ config/common_mini_tablet.mk | 8 ++++++++ 2 files changed, 19 insertions(+) create mode 100644 config/common_full_tablet.mk create mode 100644 config/common_mini_tablet.mk diff --git a/config/common_full_tablet.mk b/config/common_full_tablet.mk new file mode 100644 index 000000000..224e454e7 --- /dev/null +++ b/config/common_full_tablet.mk @@ -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) diff --git a/config/common_mini_tablet.mk b/config/common_mini_tablet.mk new file mode 100644 index 000000000..6b2c57ade --- /dev/null +++ b/config/common_mini_tablet.mk @@ -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) From d9ee6985ecd5ddbf172cd4fa64987bf05aaa2da3 Mon Sep 17 00:00:00 2001 From: Hikari-no-Tenshi Date: Thu, 10 Mar 2022 15:14:03 +0300 Subject: [PATCH 2/2] vendor: soong: switch to camera_needs_client_info_lib Change-Id: If06e73aae5fe9f1d03573ca2d5d12d53c9631b51 --- build/soong/Android.bp | 20 ++++++++++++-------- config/BoardConfigSoong.mk | 4 ++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/build/soong/Android.bp b/build/soong/Android.bp index 5186d746e..1b5617ee6 100644 --- a/build/soong/Android.bp +++ b/build/soong/Android.bp @@ -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:vendor.oneplus.hardware.camera@1.0"], }, }, } diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk index 217b13708..6428456b8 100644 --- a/config/BoardConfigSoong.mk +++ b/config/BoardConfigSoong.mk @@ -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 \ @@ -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)