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

Commit 1a409255 authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q3 (ab/11976889) to aosp-main-future 

Bug: 347831320
Merged-In: I23b7f7e8a1b43bbd5f49012c95a130d91098f92a
Change-Id: I72f3cb19133b7bd0e54a0ff7ca64cf70df2da057
parents 6ffdfe6a e75c1a4c

core/config.mk

+5 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,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



.KATI_READONLY := _product_single_value_vars _product_list_vars

_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

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

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

    debuggerd\

    device_config \

    DeviceDiagnostics \

    dmctl \

    dnsmasq \

    dmesgd \
@@ -336,7 +335,8 @@ endif 
# Check if the build supports Profiling module

ifeq ($(RELEASE_PACKAGE_PROFILING_MODULE),true)

    PRODUCT_PACKAGES += \

       com.android.profiling

       com.android.profiling \

       trace_redactor

endif



ifeq ($(RELEASE_USE_WEBVIEW_BOOTSTRAP_MODULE),true)
@@ -513,3 +513,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.mk)

# 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)



# TODO (b/342265627): Remove v/g/r once all the flags have been moved to v/g_s/b/r

PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google/release/go_devices/release_config_map.mk)