Make change and version bump to AP2A.240228.001 (d8ab7a02) · Commits · e / os / android_build

core/android_soong_config_vars.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -236,3 +236,7 @@ else
	endif		endif
	# Required as platform_bootclasspath is using this namespace		# Required as platform_bootclasspath is using this namespace
	$(call soong_config_set,bootclasspath,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))		$(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/build_id.mk

+1 −1

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

	BUILD_ID=AP2A.240227.002		BUILD_ID=AP2A.240228.001

target/product/base_system.mk

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,6 @@ PRODUCT_PACKAGES += \
	com.android.ondevicepersonalization \		com.android.ondevicepersonalization \
	com.android.os.statsd \		com.android.os.statsd \
	com.android.permission \		com.android.permission \
	com.android.profiling \
	com.android.resolv \		com.android.resolv \
	com.android.rkpd \		com.android.rkpd \
	com.android.neuralnetworks \		com.android.neuralnetworks \
	@@ -77,7 +76,6 @@ PRODUCT_PACKAGES += \
	com.android.virt \		com.android.virt \
	com.android.wifi \		com.android.wifi \
	ContactsProvider \		ContactsProvider \
	ContactKeysProvider \
	content \		content \
	CtsShimPrebuilt \		CtsShimPrebuilt \
	CtsShimPrivPrebuilt \		CtsShimPrivPrebuilt \
	@@ -92,6 +90,7 @@ PRODUCT_PACKAGES += \
	dump.erofs \		dump.erofs \
	dumpstate \		dumpstate \
	dumpsys \		dumpsys \
			E2eeContactKeysProvider \
	e2fsck \		e2fsck \
	enhanced-confirmation.xml \		enhanced-confirmation.xml \
	ExtShared \		ExtShared \
	@@ -330,6 +329,12 @@ else
	com.android.nfcservices		com.android.nfcservices
	endif		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)		ifeq ($(RELEASE_USE_WEBVIEW_BOOTSTRAP_MODULE),true)
	PRODUCT_PACKAGES += \		PRODUCT_PACKAGES += \
	com.android.webview.bootstrap		com.android.webview.bootstrap

target/product/default_art_config.mk

+14 −2

Original line number	Original line	Diff line number	Diff line
	@@ -80,7 +80,6 @@ PRODUCT_APEX_BOOT_JARS := \
	com.android.os.statsd:framework-statsd \		com.android.os.statsd:framework-statsd \
	com.android.permission:framework-permission \		com.android.permission:framework-permission \
	com.android.permission:framework-permission-s \		com.android.permission:framework-permission-s \
	com.android.profiling:framework-profiling \
	com.android.scheduling:framework-scheduling \		com.android.scheduling:framework-scheduling \
	com.android.sdkext:framework-sdkextensions \		com.android.sdkext:framework-sdkextensions \
	com.android.tethering:framework-connectivity \		com.android.tethering:framework-connectivity \
	@@ -107,6 +106,13 @@ else
	$(call soong_config_set,bootclasspath,nfc_apex_bootclasspath_fragment,true)		$(call soong_config_set,bootclasspath,nfc_apex_bootclasspath_fragment,true)
	endif		endif

			# Check if build supports Profiling module.
			ifeq ($(RELEASE_PACKAGE_PROFILING_MODULE),true)
			PRODUCT_APEX_BOOT_JARS += \
			com.android.profiling:framework-profiling \

			endif

	# TODO(b/308174306): Adjust this after multiple prebuilts version is supported.		# TODO(b/308174306): Adjust this after multiple prebuilts version is supported.
	# APEX boot jars that are not in prebuilt apexes.		# APEX boot jars that are not in prebuilt apexes.
	# Keep the list sorted by module names and then library names.		# Keep the list sorted by module names and then library names.
	@@ -157,12 +163,18 @@ PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \
	com.android.btservices:service-bluetooth \		com.android.btservices:service-bluetooth \
	com.android.devicelock:service-devicelock \		com.android.devicelock:service-devicelock \
	com.android.os.statsd:service-statsd \		com.android.os.statsd:service-statsd \
	com.android.profiling:service-profiling \
	com.android.scheduling:service-scheduling \		com.android.scheduling:service-scheduling \
	com.android.tethering:service-connectivity \		com.android.tethering:service-connectivity \
	com.android.uwb:service-uwb \		com.android.uwb:service-uwb \
	com.android.wifi:service-wifi \		com.android.wifi:service-wifi \

			# Check if build supports Profiling module.
			ifeq ($(RELEASE_PACKAGE_PROFILING_MODULE),true)
			PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS += \
			com.android.profiling:service-profiling \

			endif

	# Overrides the (apex, jar) pairs above when determining the on-device location. The format is:		# Overrides the (apex, jar) pairs above when determining the on-device location. The format is:
	# <old_apex>:<old_jar>:<new_apex>:<new_jar>		# <old_apex>:<old_jar>:<new_apex>:<new_jar>
	PRODUCT_CONFIGURED_JAR_LOCATION_OVERRIDES := \		PRODUCT_CONFIGURED_JAR_LOCATION_OVERRIDES := \