Skip to content

Commit

Permalink
Zap aapt_version_code_defaults
Browse files Browse the repository at this point in the history
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
  • Loading branch information
luca020400 authored and mikeNG committed Dec 9, 2024
1 parent ffd584f commit 87edd14
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 22 deletions.
20 changes: 0 additions & 20 deletions build/soong/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -61,26 +61,6 @@ 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: "camera_override_format_from_reserved",
module_type: "cc_defaults",
Expand Down
2 changes: 0 additions & 2 deletions config/BoardConfigSoong.mk
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ $(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 \
camera_override_format_from_reserved \
Expand Down Expand Up @@ -106,7 +105,6 @@ 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)
Expand Down

0 comments on commit 87edd14

Please sign in to comment.