diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2021-11-24 05:59:58 -0800 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2021-11-24 05:59:58 -0800 |
| commit | b2d35cd124e7c35291f48b349c7c56667348b832 (patch) | |
| tree | 5e8ba07345a1c9ad058d23d58fee2bd4098568b6 | |
| parent | 4be985158cb836c540d6d6a7cd3d1b2f6939c6c2 (diff) | |
| parent | 70baed35e1b4866916cbe8cc9f1800cd8bc668c7 (diff) | |
Merge 70baed35e1b4866916cbe8cc9f1800cd8bc668c7 on remote branch
Change-Id: I64f7b61f741e5fc7f7abb95d347837c059c67c7c
| -rw-r--r-- | base.mk | 12 | ||||
| -rw-r--r-- | lights/Android.bp | 42 | ||||
| -rw-r--r-- | ota_merge_configs/without_dynamic_partition/ab/merge_config_system_item_list | 1 | ||||
| -rw-r--r-- | ota_merge_configs/without_dynamic_partition/non_ab/merge_config_system_item_list | 2 |
4 files changed, 56 insertions, 1 deletions
@@ -606,6 +606,18 @@ LIBPOWER += android.hardware.power@1.0-impl LIBPOWER += android.hardware.power@1.0-service endif +ifeq ($(PLATFORM_VERSION), $(filter $(PLATFORM_VERSION),R 11)) + SOONG_CONFIG_NAMESPACES += lights + SOONG_CONFIG_lights += lighttargets + SOONG_CONFIG_lights_lighttargets := lightaidltarget +endif + +ifeq ($(PLATFORM_VERSION), $(filter $(PLATFORM_VERSION),S 12)) + SOONG_CONFIG_NAMESPACES += lights + SOONG_CONFIG_lights += lighttargets + SOONG_CONFIG_lights_lighttargets := lightaidlV1target +endif + #LLVM for RenderScript #use qcom LLVM $(call inherit-product-if-exists, external/llvm/llvm-select.mk) diff --git a/lights/Android.bp b/lights/Android.bp index cd4c44e..523285a 100644 --- a/lights/Android.bp +++ b/lights/Android.bp @@ -1,5 +1,46 @@ +// This introduces the module type lights_cc_defaults +// If target.mk file contained: +// +// SOONG_CONFIG_NAMESPACES += lights +// SOONG_CONFIG_lights += lighttargets +// SOONG_CONFIG_lights_lighttargets := lightaidltarget +// +// Then ligets lib would build with shared_libs + +soong_config_module_type { + name: "lights_cc_defaults", + module_type: "cc_defaults", + config_namespace: "lights", + variables: ["lighttargets"], + properties: ["shared_libs"], +} + +soong_config_string_variable { + name: "lighttargets", + values: ["lightaidltarget", "lightaidlV1target"], +} + +lights_cc_defaults { + name: "lights_defaults", + soong_config_variables: { + lighttargets: { + lightaidltarget: { + shared_libs: [ + "android.hardware.light-ndk_platform", + ], + }, + lightaidlV1target: { + shared_libs: [ + "android.hardware.light-V1-ndk_platform", + ], + }, + }, + }, +} + cc_binary { name: "android.hardware.lights-service.qti", + defaults: ["lights_defaults"], relative_install_path: "hw", init_rc: ["android.hardware.lights-qti.rc"], vintf_fragments: ["android.hardware.lights-qti.xml"], @@ -9,7 +50,6 @@ cc_binary { "liblog", "libhardware", "libbinder_ndk", - "android.hardware.light-ndk_platform", ], srcs: [ "Lights.cpp", diff --git a/ota_merge_configs/without_dynamic_partition/ab/merge_config_system_item_list b/ota_merge_configs/without_dynamic_partition/ab/merge_config_system_item_list index 203b2e8..f898258 100644 --- a/ota_merge_configs/without_dynamic_partition/ab/merge_config_system_item_list +++ b/ota_merge_configs/without_dynamic_partition/ab/merge_config_system_item_list @@ -1,3 +1,4 @@ +IMAGES/system.img META/apexkeys.txt META/apkcerts.txt META/filesystem_config.txt diff --git a/ota_merge_configs/without_dynamic_partition/non_ab/merge_config_system_item_list b/ota_merge_configs/without_dynamic_partition/non_ab/merge_config_system_item_list index 203b2e8..9f921ec 100644 --- a/ota_merge_configs/without_dynamic_partition/non_ab/merge_config_system_item_list +++ b/ota_merge_configs/without_dynamic_partition/non_ab/merge_config_system_item_list @@ -1,3 +1,5 @@ +IMAGES/system.img +IMAGES/system.map META/apexkeys.txt META/apkcerts.txt META/filesystem_config.txt |