Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (be54054f) · Commits · e / os / android_vendor_lineage

build/soong/Android.bp

+45 −0

Original line number	Diff line number	Diff line
		@@ -205,6 +205,51 @@ egl_display_array {
		},
		}

		soong_config_module_type {
		name: "health_charging_control",
		module_type: "cc_defaults",
		config_namespace: "lineageGlobalVars",
		bool_variables: [
		"target_health_charging_control_supports_toggle",
		"target_health_charging_control_supports_bypass",
		"target_health_charging_control_supports_deadline",
		],
		value_variables: [
		"target_health_charging_control_charging_path",
		"target_health_charging_control_charging_enabled",
		"target_health_charging_control_charging_disabled",
		"target_health_charging_control_deadline_path",
		],
		properties: ["cppflags"],
		}

		health_charging_control {
		name: "health_charging_control_defaults",
		soong_config_variables: {
		target_health_charging_control_supports_toggle: {
		cppflags: ["-DHEALTH_CHARGING_CONTROL_SUPPORTS_TOGGLE"],
		},
		target_health_charging_control_supports_bypass: {
		cppflags: ["-DHEALTH_CHARGING_CONTROL_SUPPORTS_BYPASS"],
		},
		target_health_charging_control_supports_deadline: {
		cppflags: ["-DHEALTH_CHARGING_CONTROL_SUPPORTS_DEADLINE"],
		},
		target_health_charging_control_charging_path: {
		cppflags: ["-DHEALTH_CHARGING_CONTROL_CHARGING_PATH=\"%s\""],
		},
		target_health_charging_control_charging_enabled: {
		cppflags: ["-DHEALTH_CHARGING_CONTROL_CHARGING_ENABLED=\"%s\""],
		},
		target_health_charging_control_charging_disabled: {
		cppflags: ["-DHEALTH_CHARGING_CONTROL_CHARGING_DISABLED=\"%s\""],
		},
		target_health_charging_control_deadline_path: {
		cppflags: ["-DHEALTH_CHARGING_CONTROL_DEADLINE_PATH=\"%s\""],
		},
		},
		}

		// NVIDIA specific config modules
		soong_config_module_type {
		name: "nvidia_enhancements",

config/BoardConfigSoong.mk

+19 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,13 @@ SOONG_CONFIG_lineageGlobalVars += \
		additional_gralloc_10_usage_bits \
		bootloader_message_offset \
		gralloc_handle_has_reserved_size \
		target_health_charging_control_charging_path \
		target_health_charging_control_charging_enabled \
		target_health_charging_control_charging_disabled \
		target_health_charging_control_deadline_path \
		target_health_charging_control_supports_bypass \
		target_health_charging_control_supports_deadline \
		target_health_charging_control_supports_toggle \
		target_init_vendor_lib \
		target_ld_shim_libs \
		target_surfaceflinger_udfps_lib \
		@@ -65,6 +72,11 @@ SOONG_CONFIG_lineageQcomVars_uses_pre_uplink_features_netmgrd := $(TARGET_USES_P
		BOOTLOADER_MESSAGE_OFFSET ?= 0
		TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0
		TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE ?= false
		TARGET_HEALTH_CHARGING_CONTROL_CHARGING_ENABLED ?= 1
		TARGET_HEALTH_CHARGING_CONTROL_CHARGING_DISABLED ?= 0
		TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_BYPASS ?= true
		TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_DEADLINE ?= false
		TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_TOGGLE ?= true
		TARGET_INIT_VENDOR_LIB ?= vendor_init
		TARGET_SURFACEFLINGER_UDFPS_LIB ?= surfaceflinger_udfps_lib
		TARGET_TRUST_USB_CONTROL_PATH ?= /proc/sys/kernel/deny_new_usb
		@@ -74,6 +86,13 @@ TARGET_TRUST_USB_CONTROL_DISABLE ?= 0
		# Soong value variables
		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_target_health_charging_control_charging_path := $(TARGET_HEALTH_CHARGING_CONTROL_CHARGING_PATH)
		SOONG_CONFIG_lineageGlobalVars_target_health_charging_control_charging_enabled := $(TARGET_HEALTH_CHARGING_CONTROL_CHARGING_ENABLED)
		SOONG_CONFIG_lineageGlobalVars_target_health_charging_control_charging_disabled := $(TARGET_HEALTH_CHARGING_CONTROL_CHARGING_DISABLED)
		SOONG_CONFIG_lineageGlobalVars_target_health_charging_control_deadline_path := $(TARGET_HEALTH_CHARGING_CONTROL_DEADLINE_PATH)
		SOONG_CONFIG_lineageGlobalVars_target_health_charging_control_supports_bypass := $(TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_BYPASS)
		SOONG_CONFIG_lineageGlobalVars_target_health_charging_control_supports_deadline := $(TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_DEADLINE)
		SOONG_CONFIG_lineageGlobalVars_target_health_charging_control_supports_toggle := $(TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_TOGGLE)
		SOONG_CONFIG_lineageGlobalVars_target_init_vendor_lib := $(TARGET_INIT_VENDOR_LIB)
		SOONG_CONFIG_lineageGlobalVars_target_ld_shim_libs := $(subst $(space),:,$(TARGET_LD_SHIM_LIBS))
		SOONG_CONFIG_lineageGlobalVars_target_surfaceflinger_udfps_lib := $(TARGET_SURFACEFLINGER_UDFPS_LIB)

config/device_framework_matrix.xml

+8 −1

Original line number	Diff line number	Diff line
		<?xml version="2.0" encoding="UTF-8"?>
		<!--
		Copyright (C) 2021-2022 The LineageOS Project
		Copyright (C) 2021-2023 The LineageOS Project
		SPDX-License-Identifier: Apache-2.0
		-->
		<compatibility-matrix version="2.0" type="framework">
		@@ -22,6 +22,13 @@
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>vendor.lineage.health</name>
		<interface>
		<name>IChargingControl</name>
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>vendor.lineage.powershare</name>
		<version>1.0</version>

config/lineage_sdk_common.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		PRODUCT_COPY_FILES += \
		vendor/lineage/config/permissions/org.lineageos.globalactions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.globalactions.xml \
		vendor/lineage/config/permissions/org.lineageos.hardware.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.hardware.xml \
		vendor/lineage/config/permissions/org.lineageos.health.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.health.xml \
		vendor/lineage/config/permissions/org.lineageos.livedisplay.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.livedisplay.xml \
		vendor/lineage/config/permissions/org.lineageos.profiles.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.profiles.xml \
		vendor/lineage/config/permissions/org.lineageos.settings.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.settings.xml \

config/permissions/org.lineageos.health.xml

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2023 The LineageOS Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<permissions>
		<!-- The feature listed here coincides with the HealthInterfaceService declared as
		part of the external lineage service init in SystemServer. If this xml isn't present
		on the device, the service will not be published as a binder service!
		-->
		<feature name="org.lineageos.health" />
		</permissions>