Zap aapt_version_code_defaults
It was caused by package-cache in case Build.VERSION.INCREMENTAL doesn't change across builds, which is always the case for local builds, exporting BUILD_NUMBER to something != eng.$USER will fix it the next build. Change-Id: Ic602197e6711ced511a0b102b1140c5db4ec8397
This commit is contained in:
committed by
Michael Bestas
parent
ffd584f41c
commit
87edd14894
@@ -61,26 +61,6 @@ cc_library_headers {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Target platform agnostic config modules
|
// 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 {
|
soong_config_module_type {
|
||||||
name: "camera_override_format_from_reserved",
|
name: "camera_override_format_from_reserved",
|
||||||
module_type: "cc_defaults",
|
module_type: "cc_defaults",
|
||||||
|
@@ -28,7 +28,6 @@ $(foreach v,$(EXPORT_TO_SOONG),$(eval $(call addVar,$(v))))
|
|||||||
|
|
||||||
SOONG_CONFIG_NAMESPACES += lineageGlobalVars
|
SOONG_CONFIG_NAMESPACES += lineageGlobalVars
|
||||||
SOONG_CONFIG_lineageGlobalVars += \
|
SOONG_CONFIG_lineageGlobalVars += \
|
||||||
aapt_version_code \
|
|
||||||
additional_gralloc_10_usage_bits \
|
additional_gralloc_10_usage_bits \
|
||||||
bootloader_message_offset \
|
bootloader_message_offset \
|
||||||
camera_override_format_from_reserved \
|
camera_override_format_from_reserved \
|
||||||
@@ -106,7 +105,6 @@ TARGET_TRUST_USB_CONTROL_ENABLE ?= 1
|
|||||||
TARGET_TRUST_USB_CONTROL_DISABLE ?= 0
|
TARGET_TRUST_USB_CONTROL_DISABLE ?= 0
|
||||||
|
|
||||||
# Soong value variables
|
# 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_additional_gralloc_10_usage_bits := $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS)
|
||||||
SOONG_CONFIG_lineageGlobalVars_bootloader_message_offset := $(BOOTLOADER_MESSAGE_OFFSET)
|
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_path := $(TARGET_HEALTH_CHARGING_CONTROL_CHARGING_PATH)
|
||||||
|
Reference in New Issue
Block a user