From 87edd148946e5e1f530b9dd5a6e39c679dc877ea Mon Sep 17 00:00:00 2001
From: Luca Stefani <luca.stefani.ge1@gmail.com>
Date: Fri, 22 Nov 2024 17:59:03 +0100
Subject: [PATCH] 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
---
 build/soong/Android.bp     | 20 --------------------
 config/BoardConfigSoong.mk |  2 --
 2 files changed, 22 deletions(-)

diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index b0dcc658..0f5078b9 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -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",
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index e1f0cfeb..bac6d8ff 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -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 \
@@ -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)