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

Unverified Commit e99dbe1d authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r52' into staging/lineage-20.0_merge-android-13.0.0_r52 

Android 13.0.0 Release 52 (TQ3A.230605.012)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZIi36QAKCRDorT+BmrEO
# eB7uAJ9NmDkNlD24enKk/AJHpnALE/xKrwCdGPc9gt/4kT+HMhdG9IiROXWDIJQ=
# =WMVr
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 13 21:39:37 2023 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: checking the trustdb
# gpg: public key of ultimately trusted key ED97E90E62AA7E34 not found
# gpg: marginals needed: 3  completes needed: 1  trust model: tofu+pgp
# gpg: depth: 0  valid:   1  signed:   0  trust: 0-, 0q, 0n, 0m, 0f, 1u
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1683 signatures in the past
#      19 months.  Encrypted 4 messages in the past 17 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Android Build Coastguard Worker (42) and others
# Via Android Build Coastguard Worker (111) and others
* tag 'android-13.0.0_r52': (69 commits)
  Version bump to TQ3A.230605.012 [core/build_id.mk]
  Version bump to TQ3A.230605.010.A1 [core/build_id.mk]
  Update Security String to 2023-07-05
  Update Security String to 2023-07-05
  Version bump to TQ3A.230605.011 [core/build_id.mk]
  Version bump to TQ3A.230605.010 [core/build_id.mk]
  Version bump to TQ3A.230605.009.A1 [core/build_id.mk]
  Version bump to TQ3A.230605.009 [core/build_id.mk]
  Version bump to TQ3A.230605.008 [core/build_id.mk]
  Version bump to TQ3A.230605.007 [core/build_id.mk]
  Version bump to TQ3A.230605.006.X1 [core/build_id.mk]
  Version bump to TQ3A.230605.006 [core/build_id.mk]
  Version bump to TQ3A.230605.005.W1 [core/build_id.mk]
  Version bump to TQ3A.230605.005.Z1 [core/build_id.mk]
  Version bump to TQ3A.230605.005 [core/build_id.mk]
  Version bump to TQ3A.230605.004 [core/build_id.mk]
  Version bump to TQ3A.230605.003.X1 [core/build_id.mk]
  Version bump to TQ3A.230605.003 [core/build_id.mk]
  Version bump to TQ3A.230605.002 [core/build_id.mk]
  Version bump to TQ3A.230605.001 [core/build_id.mk]
  ...

 Conflicts:
	core/build_id.mk
	core/version_defaults.mk
	target/board/BoardConfigEmuCommon.mk

Change-Id: I8eff3508ce64784804d39c4694dc6adc7ca81b0e
parents 3367d170 ca8fe47f

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)