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

Commit 57520d22 authored by Xin Li's avatar Xin Li
Browse files

Merge 25Q1 (ab/BP1A.250305.020) to AOSP main 

Bug: 385190204
Merged-In: If6519a9cd5d91a1eb91f61e4c3f79829664e770c
Change-Id: I660732170a8c9e751abe239bf0c747ad3a15e6e3
parents e13bd368 b2d1cce9

core/android_soong_config_vars.mk

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

$(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA)



# Flag to use baseline profile for SystemUI.

$(call soong_config_set,ANDROID,release_systemui_use_speed_profile,$(RELEASE_SYSTEMUI_USE_SPEED_PROFILE))



# Flag for enabling compose for Launcher.

$(call soong_config_set,ANDROID,release_enable_compose_in_launcher,$(RELEASE_ENABLE_COMPOSE_IN_LAUNCHER))
@@ -216,6 +219,19 @@ endif 
# Required as platform_bootclasspath is using this namespace

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





# Add ondeviceintelligence module build flag to soong

ifeq (true,$(RELEASE_ONDEVICE_INTELLIGENCE_MODULE))

    $(call soong_config_set,ANDROID,release_ondevice_intelligence_module,true)

    # Required as platform_bootclasspath is using this namespace

    $(call soong_config_set,bootclasspath,release_ondevice_intelligence_module,true)



else

    $(call soong_config_set,ANDROID,release_ondevice_intelligence_platform,true)

    $(call soong_config_set,bootclasspath,release_ondevice_intelligence_platform,true)



endif



# 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

core/board_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ else 
      $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \

      device/generic/goldfish/board/$(TARGET_DEVICE)/BoardConfig.mk \

      device/google/cuttlefish/board/$(TARGET_DEVICE)/BoardConfig.mk \

      vendor/google/products/cuttlefish/pixel_watch/board/$(TARGET_DEVICE)/BoardConfig.mk \

      $(shell test -d device && find -L device -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \

      $(shell test -d vendor && find -L vendor -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \

    )))
@@ -289,6 +290,7 @@ $(foreach var,$(_board_true_false_vars), \ 
    $(error Valid values of $(var) are "true", "false", and "". Not "$($(var))")))



include $(BUILD_SYSTEM)/board_config_wifi.mk

include $(BUILD_SYSTEM)/board_config_wpa_supplicant.mk



# Set up soong config for "soong_config_value_variable".

-include hardware/interfaces/configstore/1.1/default/surfaceflinger.mk

core/board_config_wpa_supplicant.mk

0 → 100644
+88 −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.

#



# ###############################################################

# This file adds wpa_supplicant_8 variables into soong config namespace (`wpa_supplicant_8`)

# ###############################################################



ifdef BOARD_HOSTAPD_DRIVER

$(call soong_config_set_bool,wpa_supplicant_8,wpa_build_hostapd,true)

ifneq ($(BOARD_HOSTAPD_DRIVER),NL80211)

    $(error BOARD_HOSTAPD_DRIVER set to $(BOARD_HOSTAPD_DRIVER) but current soong expected it should be NL80211 only!)

endif

endif



ifdef BOARD_WPA_SUPPLICANT_DRIVER

ifneq ($(BOARD_WPA_SUPPLICANT_DRIVER),NL80211)

    $(error BOARD_WPA_SUPPLICANT_DRIVER set to $(BOARD_WPA_SUPPLICANT_DRIVER) but current soong expected it should be NL80211 only!)

endif

endif



# This is for CONFIG_DRIVER_NL80211_BRCM, CONFIG_DRIVER_NL80211_SYNA, CONFIG_DRIVER_NL80211_QCA

# And it is only used for a cflags setting in driver.

$(call soong_config_set,wpa_supplicant_8,board_wlan_device,$(BOARD_WLAN_DEVICE))



# Belong to CONFIG_IEEE80211AX definition

ifeq ($(WIFI_FEATURE_HOSTAPD_11AX),true)

$(call soong_config_set_bool,wpa_supplicant_8,hostapd_11ax,true)

endif



# Belong to CONFIG_IEEE80211BE definition

ifeq ($(WIFI_FEATURE_HOSTAPD_11BE),true)

$(call soong_config_set_bool,wpa_supplicant_8,hostapd_11be,true)

endif



# PLATFORM_VERSION

$(call soong_config_set,wpa_supplicant_8,platform_version,$(PLATFORM_VERSION))



# BOARD_HOSTAPD_PRIVATE_LIB

ifeq ($(BOARD_HOSTAPD_PRIVATE_LIB),)

$(call soong_config_set_bool,wpa_supplicant_8,hostapd_use_stub_lib,true)

else

$(call soong_config_set,wpa_supplicant_8,board_hostapd_private_lib,$(BOARD_HOSTAPD_PRIVATE_LIB))

endif



ifeq ($(BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL),true)

$(call soong_config_set_bool,wpa_supplicant_8,board_hostapd_config_80211w_mfp_optional,true)

endif



ifneq ($(BOARD_HOSTAPD_PRIVATE_LIB_EVENT),)

$(call soong_config_set_bool,wpa_supplicant_8,board_hostapd_private_lib_event,true)

endif



# BOARD_WPA_SUPPLICANT_PRIVATE_LIB

ifeq ($(BOARD_WPA_SUPPLICANT_PRIVATE_LIB),)

$(call soong_config_set_bool,wpa_supplicant_8,wpa_supplicant_use_stub_lib,true)

else

$(call soong_config_set,wpa_supplicant_8,board_wpa_supplicant_private_lib,$(BOARD_WPA_SUPPLICANT_PRIVATE_LIB))

endif



ifneq ($(BOARD_WPA_SUPPLICANT_PRIVATE_LIB_EVENT),)

$(call soong_config_set_bool,wpa_supplicant_8,board_wpa_supplicant_private_lib_event,true)

endif



ifeq ($(WIFI_PRIV_CMD_UPDATE_MBO_CELL_STATUS), enabled)

$(call soong_config_set_bool,wpa_supplicant_8,wifi_priv_cmd_update_mbo_cell_status,true)

endif



ifeq ($(WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY), true)

$(call soong_config_set_bool,wpa_supplicant_8,wifi_hidl_unified_supplicant_service_rc_entry,true)

endif



# New added in internal main

ifeq ($(WIFI_BRCM_OPEN_SOURCE_MULTI_AKM), enabled)

$(call soong_config_set_bool,wpa_supplicant_8,wifi_brcm_open_source_multi_akm,true)

endif

core/layoutlib_data.mk

+2 −3
Original line number Diff line number Diff line
@@ -3,11 +3,10 @@ 
FONT_TEMP := $(call intermediates-dir-for,PACKAGING,fonts,HOST,COMMON)



# The font configuration files - system_fonts.xml, fallback_fonts.xml etc.

font_config := $(sort $(wildcard frameworks/base/data/fonts/*.xml))

font_config := $(filter $(TARGET_OUT)/etc/font%.xml, $(INTERNAL_SYSTEMIMAGE_FILES))

font_config := $(addprefix $(FONT_TEMP)/, $(notdir $(font_config)))



$(font_config): $(FONT_TEMP)/%.xml: \

			frameworks/base/data/fonts/%.xml

$(font_config): $(FONT_TEMP)/%: $(TARGET_OUT)/etc/%

	$(hide) mkdir -p $(dir $@)

	$(hide) cp -vf $< $@

core/sysprop.mk

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ define generate-common-build-props 
    echo "ro.$(1).build.version.release=$(PLATFORM_VERSION_LAST_STABLE)" >> $(2);\

    echo "ro.$(1).build.version.release_or_codename=$(PLATFORM_VERSION)" >> $(2);\

    echo "ro.$(1).build.version.sdk=$(PLATFORM_SDK_VERSION)" >> $(2);\

    echo "ro.$(1).build.version.sdk_minor=$(PLATFORM_SDK_MINOR_VERSION)" >> $(2);\



endef