Merge "Flag removal: RELEASE_AVATAR_PICKER_APP" into main (8eca2982) · Commits · e / os / android_build

target/product/base_system.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -587,4 +587,3 @@ $(call inherit-product,$(SRC_TARGET_DIR)/product/updatable_apex.mk)

		$(call soong_config_set, bionic, large_system_property_node, $(RELEASE_LARGE_SYSTEM_PROPERTY_NODE))
		$(call soong_config_set, Aconfig, read_from_new_storage, $(RELEASE_READ_FROM_NEW_STORAGE))
		$(call soong_config_set, SettingsLib, legacy_avatar_picker_app_enabled, $(if $(RELEASE_AVATAR_PICKER_APP),,true))

+1 −10

Original line number	Diff line number	Diff line
		@@ -185,6 +185,7 @@ android_system_image {
		"EmergencyInfo",

		// handheld_product
		"AvatarPicker",
		"Calendar",
		"Contacts",
		"DeskClock",
		@@ -212,14 +213,4 @@ android_system_image {
		true: true,
		default: false,
		}),
		multilib: {
		common: {
		deps: select(release_flag("RELEASE_AVATAR_PICKER_APP"), {
		true: [
		"AvatarPicker", // handheld_system_ext (RELEASE_AVATAR_PICKER_APP)
		],
		default: [],
		}),
		},
		},
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
		# /system_ext packages
		PRODUCT_PACKAGES += \
		AccessibilityMenu \
		$(if $(RELEASE_AVATAR_PICKER_APP), AvatarPicker,) \
		AvatarPicker \
		Launcher3QuickStep \
		Provision \
		Settings \