Merge remote-tracking branch 'upstream/lineage-22.2' into HEAD
diff --git a/core/Makefile b/core/Makefile
index 025f383..7b43859 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -7223,14 +7223,10 @@
$(call declare-0p-target,$(INTERNAL_OTA_METADATA))
-ifeq ($(TARGET_BUILD_VARIANT),user)
+ifeq ($(TARGET_EXCLUDE_BACKUPTOOL),true)
$(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false
else
-ifneq ($(LINEAGE_BUILD),)
$(INTERNAL_OTA_PACKAGE_TARGET): backuptool := true
-else
- $(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false
-endif
endif
$(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
@@ -8035,8 +8031,8 @@
-include $(sort $(wildcard device/*/*/build/tasks/*.mk))
-include $(sort $(wildcard product/*/*/build/tasks/*.mk))
# Also add test specifc tasks
-include $(sort $(wildcard platform_testing/build/tasks/*.mk))
-include $(sort $(wildcard test/vts/tools/build/tasks/*.mk))
+#include $(sort $(wildcard platform_testing/build/tasks/*.mk))
+#include $(sort $(wildcard test/vts/tools/build/tasks/*.mk))
endif
include $(BUILD_SYSTEM)/product-graph.mk
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index 11c1944..44cc99a 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -33,7 +33,7 @@
KNOWN_ARMv8_CORES := cortex-a53 cortex-a53.a57 cortex-a55 cortex-a73 cortex-a75 cortex-a76
KNOWN_ARMv8_CORES += kryo kryo385 exynos-m1 exynos-m2
-KNOWN_ARMv82a_CORES := cortex-a55 cortex-a75 kryo385
+KNOWN_ARMv82a_CORES := cortex-a55 cortex-a75 cortex-a76 kryo385
ifeq (,$(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT := generic
diff --git a/core/generate_enforce_rro.mk b/core/generate_enforce_rro.mk
index b002469..a9ec7d3 100644
--- a/core/generate_enforce_rro.mk
+++ b/core/generate_enforce_rro.mk
@@ -1,6 +1,6 @@
include $(CLEAR_VARS)
-enforce_rro_module := $(enforce_rro_source_module)__$(PRODUCT_NAME)__auto_generated_rro_$(enforce_rro_partition)
+enforce_rro_module := $(enforce_rro_source_module)__$(PRODUCT_DEVICE)__auto_generated_rro_$(enforce_rro_partition)
LOCAL_PACKAGE_NAME := $(enforce_rro_module)
intermediates := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),,COMMON)
diff --git a/core/sysprop.mk b/core/sysprop.mk
index 5748c61..75cd82c 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -173,13 +173,7 @@
# non-default dev keys (usually private keys from a vendor directory).
# Both of these tags will be removed and replaced with "release-keys"
# when the target-files is signed in a post-build step.
-ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey)
-BUILD_KEYS := test-keys
-else ifneq ($(filter vendor/lineage-priv/%,$(DEFAULT_SYSTEM_DEV_CERTIFICATE)),)
BUILD_KEYS := release-keys
-else
-BUILD_KEYS := dev-keys
-endif
BUILD_VERSION_TAGS += $(BUILD_KEYS)
BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))
diff --git a/envsetup.sh b/envsetup.sh
index eaba567..c7422a9 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1207,6 +1207,44 @@
source_vendorsetup
addcompletions
+function setup_ccache() {
+ # check and set ccache path on envsetup
+ if [ -z "${CCACHE_EXEC}" ]; then
+ if command -v ccache &>/dev/null; then
+ export USE_CCACHE=1
+ export CCACHE_EXEC=$(command -v ccache)
+ [ -z "${CCACHE_DIR}" ] && export CCACHE_DIR="$HOME/.ccache"
+ echo "ccache directory found, CCACHE_DIR set to: $CCACHE_DIR" >&2
+ CCACHE_MAXSIZE="${CCACHE_MAXSIZE:-40G}"
+ DIRECT_MODE="${DIRECT_MODE:-false}"
+ $CCACHE_EXEC -o compression=true -o direct_mode="${DIRECT_MODE}" -M "${CCACHE_MAXSIZE}" \
+ && echo "ccache enabled, CCACHE_EXEC set to: $CCACHE_EXEC, CCACHE_MAXSIZE set to: $CCACHE_MAXSIZE, direct_mode set to: $DIRECT_MODE" >&2 \
+ || echo "Warning: Could not set cache size limit. Please check ccache configuration." >&2
+ CURRENT_CCACHE_SIZE=$(du -sh "$CCACHE_DIR" 2>/dev/null | cut -f1)
+ if [ -n "$CURRENT_CCACHE_SIZE" ]; then
+ echo "Current ccache size is: $CURRENT_CCACHE_SIZE" >&2
+ else
+ echo "No cached files in ccache." >&2
+ fi
+ else
+ echo "Error: ccache not found. Please install ccache." >&2
+ fi
+ fi
+}
+
+function remove_broken_build_tools() {
+ if [ -n "$ZSH_VERSION" ]; then
+ setopt NULL_GLOB
+ fi
+
+ for file in prebuilts/build-tools/path/*/date prebuilts/build-tools/path/*/tar; do
+ [ -e "$file" ] && rm -rf "$file"
+ done
+}
+
+remove_broken_build_tools
+setup_ccache
+
export ANDROID_BUILD_TOP=$(gettop)
. $ANDROID_BUILD_TOP/vendor/lineage/build/envsetup.sh