Merge "Merge Android 14 QPR3 to AOSP main" into main (3ab9f3fd) · Commits · e / os / android_build

core/android_soong_config_vars.mk

+7 −11

Original line number	Diff line number	Diff line
		@@ -60,19 +60,10 @@ endif
		# Set this soong config variable to true for now, and cleanup `prefer` as part of b/308187800
		$(call add_soong_config_var_value,ANDROID,module_build_from_source,true)

		# Messaging app vars
		ifeq (eng,$(TARGET_BUILD_VARIANT))
		$(call soong_config_set,messaging,build_variant_eng,true)
		endif

		# Enable SystemUI optimizations by default unless explicitly set.
		SYSTEMUI_OPTIMIZE_JAVA ?= true
		$(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA)

		# Enable Compose in SystemUI by default.
		SYSTEMUI_USE_COMPOSE ?= true
		$(call add_soong_config_var,ANDROID,SYSTEMUI_USE_COMPOSE)

		ifdef PRODUCT_AVF_ENABLED
		$(call add_soong_config_var_value,ANDROID,avf_enabled,$(PRODUCT_AVF_ENABLED))
		endif
		@@ -156,6 +147,7 @@ endif

		# Add crashrecovery build flag to soong
		$(call soong_config_set,ANDROID,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))
		# Add crashrecovery file move flags to soong, for both platform and module
		ifeq (true,$(RELEASE_CRASHRECOVERY_FILE_MOVE))
		$(call soong_config_set,ANDROID,crashrecovery_files_in_module,true)
		$(call soong_config_set,ANDROID,crashrecovery_files_in_platform,false)
		@@ -163,5 +155,9 @@ else
		$(call soong_config_set,ANDROID,crashrecovery_files_in_module,false)
		$(call soong_config_set,ANDROID,crashrecovery_files_in_platform,true)
		endif
		# Weirdly required because platform_bootclasspath is using AUTO namespace
		$(call soong_config_set,AUTO,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))
		# Required as platform_bootclasspath is using this namespace
		$(call soong_config_set,bootclasspath,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))

		# Enable Profiling module. Also used by platform_bootclasspath.
		$(call soong_config_set,ANDROID,release_package_profiling_module,$(RELEASE_PACKAGE_PROFILING_MODULE))
		$(call soong_config_set,bootclasspath,release_package_profiling_module,$(RELEASE_PACKAGE_PROFILING_MODULE))

core/tasks/cts.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ test_suite_name := cts
		test_suite_tradefed := cts-tradefed
		test_suite_dynamic_config := cts/tools/cts-tradefed/DynamicConfig.xml
		test_suite_readme := cts/tools/cts-tradefed/README
		test_suite_tools := $(HOST_OUT_JAVA_LIBRARIES)/ats_console_deploy.jar \
		$(HOST_OUT_JAVA_LIBRARIES)/ats_olc_server_local_mode_deploy.jar

		$(call declare-1p-target,$(test_suite_dynamic_config),cts)
		$(call declare-1p-target,$(test_suite_readme),cts)

core/tasks/mcts.mk

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2023 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/mts/README.md),)

		mcts_test_suites :=
		mcts_test_suites += mcts

		$(foreach module, $(mts_modules), $(eval mcts_test_suites += mcts-$(module)))

		$(foreach suite, $(mcts_test_suites), \
		$(eval test_suite_name := $(suite)) \
		$(eval test_suite_tradefed := mts-tradefed) \
		$(eval test_suite_readme := test/mts/README.md) \
		$(eval include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk) \
		$(eval .PHONY: $(suite)) \
		$(eval $(suite): $(compatibility_zip)) \
		$(eval $(call dist-for-goals, $(suite), $(compatibility_zip))) \
		)

		endif

core/tasks/tools/compatibility.mk

+11 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,15 @@
		# Output variables:
		# compatibility_zip: the path to the output zip file.

		special_mts_test_suites :=
		special_mts_test_suites += mcts
		special_mts_test_suites += $(mts_modules)
		ifneq ($(filter $(special_mts_test_suites),$(subst -, ,$(test_suite_name))),)
		test_suite_subdir := android-mts
		else
		test_suite_subdir := android-$(test_suite_name)
		endif

		out_dir := $(HOST_OUT)/$(test_suite_name)/$(test_suite_subdir)
		test_artifacts := $(COMPATIBILITY.$(test_suite_name).FILES)
		test_tools := $(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar \
		@@ -107,9 +115,9 @@ test_suite_notice_html := $(out_dir)/NOTICE.html
		compatibility_zip_deps += $(test_suite_notice_txt)
		compatibility_zip_resources += $(test_suite_notice_txt)

		compatibility_tests_list_zip := $(out_dir)-tests_list.zip
		compatibility_tests_list_zip := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name)-tests_list.zip

		compatibility_zip := $(out_dir).zip
		compatibility_zip := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name).zip
		$(compatibility_zip) : .KATI_IMPLICIT_OUTPUTS := $(compatibility_tests_list_zip)
		$(compatibility_zip): PRIVATE_OUT_DIR := $(out_dir)
		$(compatibility_zip): PRIVATE_TOOLS := $(test_tools) $(test_suite_prebuilt_tools)

target/product/base_system.mk

+13 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ PRODUCT_PACKAGES += \
		CtsShimPrivPrebuilt \
		debuggerd\
		device_config \
		DeviceDiagnostics \
		dmctl \
		dnsmasq \
		dmesgd \
		@@ -91,7 +92,9 @@ PRODUCT_PACKAGES += \
		dump.erofs \
		dumpstate \
		dumpsys \
		E2eeContactKeysProvider \
		e2fsck \
		enhanced-confirmation.xml \
		ExtShared \
		flags_health_check \
		framework-graphics \
		@@ -235,6 +238,7 @@ PRODUCT_PACKAGES += \
		org.apache.http.legacy \
		otacerts \
		PackageInstaller \
		package-shareduid-allowlist.xml \
		passwd_system \
		perfetto \
		perfetto-extras \
		@@ -287,6 +291,7 @@ PRODUCT_PACKAGES += \
		uiautomator \
		uinput \
		uncrypt \
		uprobestats \
		usbd \
		vdc \
		vintf \
		@@ -328,6 +333,12 @@ else
		com.android.nfcservices
		endif

		# Check if the build supports Profiling module
		ifeq ($(RELEASE_PACKAGE_PROFILING_MODULE),true)
		PRODUCT_PACKAGES += \
		com.android.profiling
		endif

		ifeq ($(RELEASE_USE_WEBVIEW_BOOTSTRAP_MODULE),true)
		PRODUCT_PACKAGES += \
		com.android.webview.bootstrap
		@@ -499,3 +510,5 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/build_variables.mk)

		# Use "image" APEXes always.
		$(call inherit-product,$(SRC_TARGET_DIR)/product/updatable_apex.mk)

		$(call soong_config_set, bionic, large_system_property_node, $(RELEASE_LARGE_SYSTEM_PROPERTY_NODE))