Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1b3879e authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 922a7279 e99dbe1d

core/OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ per-file dex_preopt*.mk = ngeoffray@google.com,calin@google.com,mathewi@google.c 
per-file verify_uses_libraries.sh = ngeoffray@google.com,calin@google.com,skvadrik@google.com



# For version updates

per-file version_defaults.mk = aseaton@google.com,elisapascual@google.com,lubomir@google.com,pscovanner@google.com

per-file version_defaults.mk = aseaton@google.com,lubomir@google.com,pscovanner@google.com,bkhalife@google.com,jainne@google.com

core/android_soong_config_vars.mk

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ endif 
# are controlled by the MODULE_BUILD_FROM_SOURCE environment variable by

# default.

INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \

  bluetooth \

  btservices \

  permission \

  uwb \

  wifi \

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



BUILD_ID=TQ2A.230505.002
 
BUILD_ID=TQ3A.230605.012

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -270,6 +270,9 @@ _product_list_vars += PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION 
# This flag implies PRODUCT_USE_DYNAMIC_PARTITIONS.

_product_single_value_vars += PRODUCT_RETROFIT_DYNAMIC_PARTITIONS



# List of tags that will be used to gate blueprint modules from the build graph

_product_list_vars += PRODUCT_INCLUDE_TAGS



# When this is true, various build time as well as runtime debugfs restrictions are enabled.

_product_single_value_vars += PRODUCT_SET_DEBUGFS_RESTRICTIONS

core/product_config.mk

+8 −0
Original line number Diff line number Diff line
@@ -278,6 +278,14 @@ all_product_makefiles := 
all_product_configs :=



#############################################################################

# Check product include tag allowlist

BLUEPRINT_INCLUDE_TAGS_ALLOWLIST := com.android.mainline_go com.android.mainline

.KATI_READONLY := BLUEPRINT_INCLUDE_TAGS_ALLOWLIST

$(foreach include_tag,$(PRODUCT_INCLUDE_TAGS), \

	$(if $(filter $(include_tag),$(BLUEPRINT_INCLUDE_TAGS_ALLOWLIST)),,\

	$(call pretty-error, $(include_tag) is not in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST: $(BLUEPRINT_INCLUDE_TAGS_ALLOWLIST))))

#############################################################################



# Quick check and assign default values



TARGET_DEVICE := $(PRODUCT_DEVICE)