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

build/soong/Android.bp

+20 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,26 @@ cc_library_headers {
		}

		// Target platform agnostic config modules
		soong_config_module_type {
		name: "aapt_version_code",
		module_type: "java_defaults",
		config_namespace: "lineageGlobalVars",
		value_variables: ["aapt_version_code"],
		properties: ["aaptflags"],
		}

		aapt_version_code {
		name: "aapt_version_code_defaults",
		soong_config_variables: {
		aapt_version_code: {
		aaptflags: [
		"--version-code",
		"%s",
		],
		},
		},
		}

		soong_config_module_type {
		name: "gralloc_10_usage_bits",
		module_type: "cc_defaults",

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ $(foreach v,$(EXPORT_TO_SOONG),$(eval $(call addVar,$(v))))

		SOONG_CONFIG_NAMESPACES += lineageGlobalVars
		SOONG_CONFIG_lineageGlobalVars += \
		aapt_version_code \
		additional_gralloc_10_usage_bits \
		bootloader_message_offset \
		gralloc_handle_has_reserved_size \
		@@ -84,6 +85,7 @@ TARGET_TRUST_USB_CONTROL_ENABLE ?= 1
		TARGET_TRUST_USB_CONTROL_DISABLE ?= 0

		# Soong value variables
		SOONG_CONFIG_lineageGlobalVars_aapt_version_code := $(shell date -u +%Y%m%d)
		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)

+5 −0

Original line number	Diff line number	Diff line
		@@ -34,4 +34,9 @@
		<!-- Icons that don't show in a collapsed statusbar on keyguard -->
		<string-array name="config_keyguard_statusbar_icon_blocklist" translatable="false">
		</string-array>

		<!-- ComponentName for the file browsing app that the system would expect to be used in work
		profile. The icon for this app will be shown to the user when informing them that a
		screenshot has been saved to work profile. If blank, a default icon will be shown. -->
		<string name="config_sceenshotWorkProfileFilesApp" translatable="false">com.android.documentsui/.files.LauncherActivity</string>
		</resources>