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

Commit 3e266be1 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master

parents 1ad1d38e d8cc7f97

core/android_soong_config_vars.mk

+8 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ endif 


$(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE))



ifdef TARGET_BOARD_AUTO

  $(call add_soong_config_var_value, ANDROID, target_board_auto, $(TARGET_BOARD_AUTO))

endif



# Ensure that those mainline modules who have individually toggleable prebuilts

# are controlled by the MODULE_BUILD_FROM_SOURCE environment variable by

# default.
@@ -106,6 +110,10 @@ endif 
SYSTEMUI_OPTIMIZE_JAVA ?= true

$(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA)



# Disable Compose in SystemUI by default.

SYSTEMUI_USE_COMPOSE ?= false

$(call add_soong_config_var,ANDROID,SYSTEMUI_USE_COMPOSE)



ifdef PRODUCT_AVF_ENABLED

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

endif

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  It must be of the form "YYYY-MM-DD" on production devices.

    #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.

    #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

    PLATFORM_SECURITY_PATCH := 2023-01-05

    PLATFORM_SECURITY_PATCH := 2023-02-05

endif



include $(BUILD_SYSTEM)/version_util.mk

target/product/window_extensions.mk

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

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

#



# /system_ext packages

PRODUCT_PACKAGES += \

    androidx.window.extensions \

    androidx.window.sidecar



# properties

PRODUCT_PRODUCT_PROPERTIES += \

    persist.wm.extensions.enabled=true