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

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

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

Android 13.0.0 Release 16 (TQ1A.221205.011)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCY45r9QAKCRDorT+BmrEO
# eGd6AJ9WUG65nMf/r4lXGe2/jtxlbFSIEgCdGQEetVCtaTI+5H20+ItbgrgkVvg=
# =vBCu
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Dec  6 00:08:53 2022 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1386 signatures in the past
#      13 months.  Encrypted 4 messages in the past 10 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 (46) and others
# Via Android Build Coastguard Worker (183) and others
* tag 'android-13.0.0_r16': (66 commits)
  Version bump to TQ1A.221205.011 [core/build_id.mk]
  Version bump to TQ1A.221205.010 [core/build_id.mk]
  Version bump to TQ1A.221205.009 [core/build_id.mk]
  Version bump to TQ1A.221205.008 [core/build_id.mk]
  Version bump to TQ1A.221205.007 [core/build_id.mk]
  Version bump to TQ1A.221205.006 [core/build_id.mk]
  Version bump to TQ1A.221205.005 [core/build_id.mk]
  Version bump to TQ1A.221205.004 [core/build_id.mk]
  Version bump to TQ1A.221205.003 [core/build_id.mk]
  Version bump to TQ1A.221205.002 [core/build_id.mk]
  Update Security String to 2022-12-05
  Version bump to TQ1A.221003.006 [core/build_id.mk]
  Version bump to TQ1A.221003.005 [core/build_id.mk]
  Version bump to TQ1A.221003.004 [core/build_id.mk]
  Version bump to TQ1A.221003.003 [core/build_id.mk]
  Version bump to TQ1A.221003.002 [core/build_id.mk]
  Version bump to TQ1A.220930.003 [core/build_id.mk]
  Version bump to TQ1A.220930.002 [core/build_id.mk]
  Version bump to TQ1A.220916.002 [core/build_id.mk]
  Version bump to TQ1A.220915.002 [core/build_id.mk]
  ...

 Conflicts:
	core/build_id.mk
	core/version_defaults.mk

Change-Id: Ib700be2df0e534d578e3aa3184ce9c29898dd8a0
parents 5c8315e9 162b02eb

core/android_soong_config_vars.mk

+19 −4
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE)) 
# default.

INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \

  bluetooth \

  permission \

  uwb \

  wifi \
@@ -147,11 +148,25 @@ ifeq (eng,$(TARGET_BUILD_VARIANT)) 
$(call soong_config_set,messaging,build_variant_eng,true)

endif



# TODO(b/203088572): Remove when Java optimizations enabled by default for

# SystemUI.

# Enable SystemUI optimizations by default unless explicitly set.

SYSTEMUI_OPTIMIZE_JAVA ?= true

$(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA)

# TODO(b/196084106): Remove when Java optimizations enabled by default for

# system packages.



# Enable system_server optimizations by default unless explicitly set or if

# there may be dependent runtime jars.

# TODO(b/240588226): Remove the off-by-default exceptions after handling

# system_server jars automatically w/ R8.

ifeq (true,$(PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS))

  # If system_server jar ordering is broken, don't assume services.jar can be

  # safely optimized in isolation, as there may be dependent jars.

  SYSTEM_OPTIMIZE_JAVA ?= false

else ifneq (platform:services,$(lastword $(PRODUCT_SYSTEM_SERVER_JARS)))

  # If services is not the final jar in the dependency ordering, don't assume

  # it can be safely optimized in isolation, as there may be dependent jars.

  SYSTEM_OPTIMIZE_JAVA ?= false

else

  SYSTEM_OPTIMIZE_JAVA ?= true

endif

$(call add_soong_config_var,ANDROID,SYSTEM_OPTIMIZE_JAVA)



# Check for SupplementalApi module.

core/app_prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ $(error You must put all the split source apks in the same folder: $(LOCAL_PACKA 
endif

my_src_dir := $(LOCAL_PATH)/$(my_src_dir)



$(built_apk_splits) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem

$(built_apk_splits) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem | $(ZIPALIGN) $(ZIP2ZIP) $(SIGNAPK_JAR) $(SIGNAPK_JNI_LIBRARY_PATH)

$(built_apk_splits) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8

$(built_apk_splits) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem

$(built_apk_splits) : $(intermediates)/%.apk : $(my_src_dir)/%.apk

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=TD1A.221105.001
 
BUILD_ID=TQ1A.221205.011

core/product-graph.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ define gather-all-makefiles-for-current-product-inner 
		$(if $(filter $(p),$(_all_products_visited)),, \

			$(p) \

			$(eval _all_products_visited += $(p)) \

			$(call all-products-inner, $(PRODUCTS.$(strip $(p)).INHERITS_FROM))

			$(call gather-all-makefiles-for-current-product-inner, $(PRODUCTS.$(strip $(p)).INHERITS_FROM))

		) \

	)

endef

core/tasks/sts-lite.mk

0 → 100644
+40 −0
Original line number Diff line number Diff line 
# Copyright (C) 2022 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



ifneq ($(wildcard test/sts/README-sts-sdk.md),)

test_suite_name := sts-lite

test_suite_tradefed := sts-tradefed

test_suite_readme := test/sts/README-sts-sdk.md

sts_sdk_zip := $(HOST_OUT)/$(test_suite_name)/sts-sdk.zip



include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk



sts_sdk_samples := $(call intermediates-dir-for,ETC,sts-sdk-samples.zip)/sts-sdk-samples.zip



$(sts_sdk_zip): STS_LITE_ZIP := $(compatibility_zip)

$(sts_sdk_zip): STS_SDK_SAMPLES := $(sts_sdk_samples)

$(sts_sdk_zip): $(MERGE_ZIPS) $(ZIP2ZIP) $(compatibility_zip) $(sts_sdk_samples)

	rm -f $@ $(STS_LITE_ZIP)_filtered

	$(ZIP2ZIP) -i $(STS_LITE_ZIP) -o $(STS_LITE_ZIP)_filtered \

		-x android-sts-lite/tools/sts-tradefed-tests.jar \

		'android-sts-lite/tools/*:sts-test/libs/' \

		'android-sts-lite/testcases/*:sts-test/utils/'

	$(MERGE_ZIPS) $@ $(STS_LITE_ZIP)_filtered $(STS_SDK_SAMPLES)

	rm -f $(STS_LITE_ZIP)_filtered



.PHONY: sts-sdk

sts-sdk: $(sts_sdk_zip)

$(call dist-for-goals, sts-sdk, $(sts_sdk_zip))



endif