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

Commit 7c112657 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge 24Q3 to AOSP main" into main

parents 611bbbc4 5ca18247

core/config.mk

+5 −0
Original line number Diff line number Diff line
@@ -1207,6 +1207,11 @@ RSCOMPAT_NO_USAGEIO_API_LEVELS := 8 9 10 11 12 13 


APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)



# Add BUILD_NUMBER to apps if PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER is defined.

ifeq ($(PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER),true)

  APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)-$(BUILD_NUMBER_FROM_FILE)

endif



# ANDROID_WARNING_ALLOWED_PROJECTS is generated by build/soong.

define find_warning_allowed_projects

    $(filter $(ANDROID_WARNING_ALLOWED_PROJECTS),$(1)/)

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -493,6 +493,9 @@ _product_single_value_vars += PRODUCT_16K_DEVELOPER_OPTION 
# by this flag.

_product_single_value_vars += PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG



# If set, the default value of the versionName of apps will include the build number.

_product_single_value_vars += PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER



# If set, build would generate system image from Soong-defined module.

_product_single_value_vars += PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE

core/tasks/tools/compatibility.mk

+3 −1
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ 
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))),)

ifneq ($(filter $(special_mts_test_suites),$(patsubst mcts-%,%,$(test_suite_name))),)

	test_suite_subdir := android-mts

else ifneq ($(filter $(special_mts_test_suites),$(patsubst mts-%,%,$(test_suite_name))),)

	test_suite_subdir := android-mts

else

	test_suite_subdir := android-$(test_suite_name)

target/product/base_system.mk

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ PRODUCT_PACKAGES += \ 
    CtsShimPrivPrebuilt \

    debuggerd\

    device_config \

    DeviceDiagnostics \

    dmctl \

    dnsmasq \

    dmesgd \
@@ -533,3 +532,4 @@ $(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))

target/product/go_defaults.mk

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
# Inherit common Android Go defaults.

$(call inherit-product, build/make/target/product/go_defaults_common.mk)



PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_shared/build/release/go_devices/release_config_map.textproto)

# Product config map to toggle between sources and prebuilts of required mainline modules

PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_shared/build/release/gms_mainline_go/required/release_config_map.textproto)



# Add the system properties.

TARGET_SYSTEM_PROP += \