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

Commit 89ed112f authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q4 (ab/12406339) into aosp-main-future 

Bug: 370570306
Merged-In: Iaafc3cbf0842fe61c8364d04f7f47cd4698d03cf
Change-Id: Ibd327ce755dd355489d67d86fa54dc6e65871f88
parents a62a9a5e 1911f735

core/android_soong_config_vars.mk

+14 −0
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ endif 
SYSTEMUI_OPTIMIZE_JAVA ?= true

$(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA)



# Flag for enabling compose for Launcher.

$(call soong_config_set,ANDROID,release_enable_compose_in_launcher,$(RELEASE_ENABLE_COMPOSE_IN_LAUNCHER))



ifdef PRODUCT_AVF_ENABLED

$(call add_soong_config_var_value,ANDROID,avf_enabled,$(PRODUCT_AVF_ENABLED))

endif
@@ -193,6 +196,17 @@ endif 
# Required as platform_bootclasspath is using this namespace

$(call soong_config_set,bootclasspath,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))



# Add uprobestats build flag to soong

$(call soong_config_set,ANDROID,release_uprobestats_module,$(RELEASE_UPROBESTATS_MODULE))

# Add uprobestats file move flags to soong, for both platform and module

ifeq (true,$(RELEASE_UPROBESTATS_FILE_MOVE))

  $(call soong_config_set,ANDROID,uprobestats_files_in_module,true)

  $(call soong_config_set,ANDROID,uprobestats_files_in_platform,false)

else

  $(call soong_config_set,ANDROID,uprobestats_files_in_module,false)

  $(call soong_config_set,ANDROID,uprobestats_files_in_platform,true)

endif



# 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/mcts.mk

+12 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
ifneq ($(wildcard test/mts/README.md),)



mcts_test_suites :=

mcts_test_suites += mcts

mcts_all_test_suites :=

mcts_all_test_suites += mcts



$(foreach module, $(mts_modules), $(eval mcts_test_suites += mcts-$(module)))
@@ -29,4 +30,14 @@ $(foreach suite, $(mcts_test_suites), \ 
	$(eval $(call dist-for-goals, $(suite), $(compatibility_zip))) \

)



$(foreach suite, $(mcts_all_test_suites), \

	$(eval test_suite_name := $(suite)) \

	$(eval test_suite_tradefed := mcts-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

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#   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),$(patsubst mcts-%,%,$(test_suite_name))),)

	test_suite_subdir := android-mts

target/product/app_function_extensions.mk

0 → 100644
+22 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2024 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.

#



# The app function sidecar extensions



# /system_ext packages

PRODUCT_PACKAGES += \

    com.google.android.appfunctions.sidecar \

    appfunctions.sidecar.xml

target/product/base_system.mk

+13 −1
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ PRODUCT_PACKAGES += \ 
    libmedia \

    libmedia_jni \

    libmediandk \

    libmonkey_jni \

    libmtp \

    libnetd_client \

    libnetlink \
@@ -206,6 +207,7 @@ PRODUCT_PACKAGES += \ 
    libstdc++ \

    libsysutils \

    libui \

    libuprobestats_client \

    libusbhost \

    libutils \

    libvintf_jni \
@@ -294,7 +296,6 @@ PRODUCT_PACKAGES += \ 
    uiautomator \

    uinput \

    uncrypt \

    uprobestats \

    usbd \

    vdc \

    vintf \
@@ -312,6 +313,17 @@ ifeq ($(RELEASE_CRASHRECOVERY_MODULE),true) 


endif



# When we release uprobestats module

ifeq ($(RELEASE_UPROBESTATS_MODULE),true)

    PRODUCT_PACKAGES += \

        com.android.uprobestats \



else

    PRODUCT_PACKAGES += \

        uprobestats \



endif



# These packages are not used on Android TV

ifneq ($(PRODUCT_IS_ATV),true)

  PRODUCT_PACKAGES += \