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

Unverified Commit 083e8a7f authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r35' into staging/lineage-20.0_merge-android-13.0.0_r35 

Android 13.0.0 release 35

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZA9jqQAKCRDorT+BmrEO
# eIUFAJ9r1br3XD7sWVK1tmvHs5/Ld9GDOQCfeTisNr3Y4lJVtEkCCMnCeJRCsAs=
# =WfeV
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Mar 13 19:55:53 2023 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1575 signatures in the past
#      16 months.  Encrypted 4 messages in the past 14 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Android Build Coastguard Worker (37) and others
# Via Android Build Coastguard Worker (106) and others
* tag 'android-13.0.0_r35': (57 commits)
  Version bump to TQ2A.230305.008.C1 [core/build_id.mk]
  Version bump to TQ2A.230305.008 [core/build_id.mk]
  Version bump to TQ2A.230305.007 [core/build_id.mk]
  Version bump to TQ2A.230305.006 [core/build_id.mk]
  Version bump to TQ2A.230305.005 [core/build_id.mk]
  Version bump to TQ2A.230305.004 [core/build_id.mk]
  Version bump to TQ2A.230305.003 [core/build_id.mk]
  Version bump to TQ2A.230305.002 [core/build_id.mk]
  Update Security String to 2023-03-05
  Version bump to TQ2A.230109.003 [core/build_id.mk]
  Version bump to TQ2A.230109.002 [core/build_id.mk]
  Fix VB 1.0 failure due to openssl output format change
  Fix VB 1.0 failure due to openssl output format change
  Version bump to TQ2A.221216.001.A1 [core/build_id.mk]
  Version bump to TQ2A.221220.002 [core/build_id.mk]
  Version bump to TQ2A.221219.002 [core/build_id.mk]
  Add SystemUI build flag for Compose code (3/3)
  Version bump to TQ2A.221212.002 [core/build_id.mk]
  Update Security String to 2023-02-01
  Update Security String to 2023-02-01
  ...

 Conflicts:
	core/build_id.mk
	core/version_defaults.mk
	target/board/BoardConfigEmuCommon.mk

Change-Id: I4a68c49c1d19fe3cc116d5adb2bbf6734b13cbb8
parents ff39732f 4b38abd7

core/android_soong_config_vars.mk

+8 −0
Original line number Diff line number Diff line
@@ -121,6 +121,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.
@@ -152,6 +156,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)



# Enable system_server optimizations by default unless explicitly set or if

# there may be dependent runtime jars.

# TODO(b/240588226): Remove the off-by-default exceptions after handling

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



BUILD_ID=TQ1A.230205.002
 
BUILD_ID=TQ2A.230305.008.C1

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-02-05

    PLATFORM_SECURITY_PATCH := 2023-03-05

endif



include $(BUILD_SYSTEM)/version_util.mk

target/board/BoardConfigEmuCommon.mk

+4 −4
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) 


  BOARD_EXT4_SHARE_DUP_BLOCKS := true



  # 4G + 8M

  BOARD_SUPER_PARTITION_SIZE := 4303355904

  # 8G + 8M

  BOARD_SUPER_PARTITION_SIZE := 8598323200

  BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions



  ifeq ($(QEMU_USE_SYSTEM_EXT_PARTITIONS),true)
@@ -58,8 +58,8 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) 
        vendor

  endif



  # 4G

  BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 4294967296

  # 8G

  BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 8589934592



  # in build environment to speed up make -j

  ifeq ($(QEMU_DISABLE_AVB),true)

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