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

Commit c15eb7d5 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR2 to AOSP main 

Bug: 319669529
Merged-In: Icb3c8a629adb2b19e700af8c1a92cb1892ba2ca4
Change-Id: If96d30d00973a86cf05ee2f063607ca486005b01
parents 3ac66146 8a65d662

core/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -5922,6 +5922,9 @@ endif 
ifeq ($(TARGET_OTA_ALLOW_NON_AB),true)

	$(hide) echo "allow_non_ab=true" >> $@

endif

ifeq ($(BOARD_NON_AB_OTA_DISABLE_COMPRESSION),true)

	$(hide) echo "board_non_ab_ota_disable_compression=true" >> $@

endif

ifdef BOARD_PREBUILT_DTBOIMAGE

	$(hide) echo "has_dtbo=true" >> $@

ifeq ($(BOARD_AVB_ENABLE),true)

core/android_soong_config_vars.mk

+21 −3
Original line number Diff line number Diff line
@@ -37,7 +37,12 @@ $(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT) 
# Default behavior for the tree wrt building modules or using prebuilts. This

# can always be overridden by setting the environment variable

# MODULE_BUILD_FROM_SOURCE.

BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true

BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := $(RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE)

# TODO(b/301454934): The value from build flag is set to empty when use `False`

# The condition below can be removed after the issue get sorted.

ifeq (,$(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE))

  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false

endif



ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)

  # Always use sources when building the framework with Java coverage or
@@ -46,6 +51,18 @@ ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),) 
  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true

endif



ifneq ($(CLANG_COVERAGE)$(NATIVE_COVERAGE_PATHS),)

  # Always use sources when building with clang coverage and native coverage.

  # It is possible that there are certain situations when building with coverage

  # would work with prebuilts, e.g. when the coverage is not being applied to

  # modules for which we provide prebuilts. Unfortunately, determining that

  # would require embedding knowledge of which coverage paths affect which

  # modules here. That would duplicate a lot of information, add yet another

  # location  module authors have to update and complicate the logic here.

  # For nowe we will just always build from sources when doing coverage builds.

  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true

endif



# ART does not provide linux_bionic variants needed for products that

# set HOST_CROSS_OS=linux_bionic.

ifeq (linux_bionic,${HOST_CROSS_OS})
@@ -117,6 +134,7 @@ INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \ 
  rkpd \

  uwb \

  wifi \

  mediaprovider \



$(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\

  $(if $(call soong_config_get,$(m)_module,source_build),,\
@@ -144,8 +162,8 @@ endif 
SYSTEMUI_OPTIMIZE_JAVA ?= true

$(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA)



# Disable Compose in SystemUI by default.

SYSTEMUI_USE_COMPOSE ?= false

# Enable Compose in SystemUI by default.

SYSTEMUI_USE_COMPOSE ?= true

$(call add_soong_config_var,ANDROID,SYSTEMUI_USE_COMPOSE)



ifdef PRODUCT_AVF_ENABLED

core/board_config.mk

+5 −0
Original line number Diff line number Diff line
@@ -949,6 +949,11 @@ ifneq ($(TARGET_OTA_ALLOW_NON_AB),true) 
  endif

endif



# For Non A/B full OTA, disable brotli compression.

ifeq ($(TARGET_OTA_ALLOW_NON_AB),true)

  BOARD_NON_AB_OTA_DISABLE_COMPRESSION := true

endif



# Quick check for building generic OTA packages. Currently it only supports A/B OTAs.

ifeq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)

  ifneq ($(AB_OTA_UPDATER),true)

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -1273,7 +1273,7 @@ endif 
endif



ifeq (true,$(FULL_SYSTEM_OPTIMIZE_JAVA))

ifeq (,$(SYSTEM_OPTIMIZE_JAVA))

ifeq (false,$(SYSTEM_OPTIMIZE_JAVA))

$(error SYSTEM_OPTIMIZE_JAVA must be enabled when FULL_SYSTEM_OPTIMIZE_JAVA is enabled)

endif

endif

core/tasks/cts.mk

+11 −6
Original line number Diff line number Diff line
@@ -144,30 +144,30 @@ $(cts-system-api-xml-coverage-report) : $(android_cts_zip) $(cts_system_api_cove 
	$(call generate-coverage-report-cts,"CTS System API Coverage Report - XML",\

			$(PRIVATE_TEST_CASES),xml)



$(cts-verifier-coverage-report): PRIVATE_TEST_CASES := $(cts_verifier_apk)

$(cts-verifier-coverage-report): PRIVATE_TEST_CASES := $(foreach c, $(cts_verifier_apk) $(verifier-dir), $(c))

$(cts-verifier-coverage-report): PRIVATE_CTS_API_COVERAGE_EXE := $(cts_api_coverage_exe)

$(cts-verifier-coverage-report): PRIVATE_DEXDEPS_EXE := $(dexdeps_exe)

$(cts-verifier-coverage-report): PRIVATE_API_XML_DESC := $(api_xml_description)

$(cts-verifier-coverage-report): PRIVATE_NAPI_XML_DESC := $(napi_xml_description)

$(cts-verifier-coverage-report) : $(cts_verifier_apk) $(cts_api_coverage_dependencies) | $(ACP)

$(cts-verifier-coverage-report) : $(cts_verifier_apk) $(verifier-zip) $(cts_api_coverage_dependencies) | $(ACP)

	$(call generate-coverage-report-cts,"CTS Verifier API Coverage Report",\

			$(PRIVATE_TEST_CASES),html)



$(cts-combined-coverage-report): PRIVATE_TEST_CASES := $(foreach c, $(cts_verifier_apk) $(COMPATIBILITY_TESTCASES_OUT_cts), $(c))

$(cts-combined-coverage-report): PRIVATE_TEST_CASES := $(foreach c, $(cts_verifier_apk) $(COMPATIBILITY_TESTCASES_OUT_cts) $(verifier-dir), $(c))

$(cts-combined-coverage-report): PRIVATE_CTS_API_COVERAGE_EXE := $(cts_api_coverage_exe)

$(cts-combined-coverage-report): PRIVATE_DEXDEPS_EXE := $(dexdeps_exe)

$(cts-combined-coverage-report): PRIVATE_API_XML_DESC := $(api_xml_description)

$(cts-combined-coverage-report): PRIVATE_NAPI_XML_DESC := $(napi_xml_description)

$(cts-combined-coverage-report) : $(android_cts_zip) $(cts_verifier_apk) $(cts_api_coverage_dependencies) | $(ACP)

$(cts-combined-coverage-report) : $(android_cts_zip) $(cts_verifier_apk) $(verifier-zip) $(cts_api_coverage_dependencies) | $(ACP)

	$(call generate-coverage-report-cts,"CTS Combined API Coverage Report",\

			$(PRIVATE_TEST_CASES),html)



$(cts-combined-xml-coverage-report): PRIVATE_TEST_CASES := $(foreach c, $(cts_verifier_apk) $(COMPATIBILITY_TESTCASES_OUT_cts), $(c))

$(cts-combined-xml-coverage-report): PRIVATE_TEST_CASES := $(foreach c, $(cts_verifier_apk) $(COMPATIBILITY_TESTCASES_OUT_cts) $(verifier-dir), $(c))

$(cts-combined-xml-coverage-report): PRIVATE_CTS_API_COVERAGE_EXE := $(cts_api_coverage_exe)

$(cts-combined-xml-coverage-report): PRIVATE_DEXDEPS_EXE := $(dexdeps_exe)

$(cts-combined-xml-coverage-report): PRIVATE_API_XML_DESC := $(api_xml_description)

$(cts-combined-xml-coverage-report): PRIVATE_NAPI_XML_DESC := $(napi_xml_description)

$(cts-combined-xml-coverage-report) : $(android_cts_zip) $(cts_verifier_apk) $(cts_api_coverage_dependencies) | $(ACP)

$(cts-combined-xml-coverage-report) : $(android_cts_zip) $(cts_verifier_apk) $(verifier-zip) $(cts_api_coverage_dependencies) | $(ACP)

	$(call generate-coverage-report-cts,"CTS Combined API Coverage Report - XML",\

			$(PRIVATE_TEST_CASES),xml)
@@ -236,3 +236,8 @@ dexdeps_exe := 
cts_api_coverage_exe :=

cts_verifier_apk :=

android_cts_zip :=

cts-dir :=

verifier-dir-name :=

verifier-dir :=

verifier-zip-name :=

verifier-zip :=