lunch: make release argument optional

fixup! Reland: Verify init scripts for correctness during build
The dir macro returns the path with a trailing slash. The copy-files and prebuilt filter checks for files in the etc/init directory did not have a trailing slash in the comparison string. Change-Id: If56e283ac33784514d4b715bb25d48c044c904cc
2025-04-10 21:18:14 +00:00 · 2025-04-05 13:53:28 +00:00 · 2025-03-30 15:58:32 +02:00 · 2025-03-30 15:58:27 +02:00 · 2025-03-30 15:46:39 +02:00 · 2025-03-30 15:45:19 +02:00
13 changed files with 262 additions and 102 deletions
--- a/core/Makefile
+++ b/core/Makefile
@ -169,7 +169,7 @@ $(foreach cf,$(unique_product_copy_files_pairs), \
            $(eval $(call copy-xml-file-checked,$(_src),$(_fulldest))),\
            $(if $(and $(filter %.jar,$(_dest)),$(filter $(basename $(notdir $(_dest))),$(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))),\
                $(eval $(call copy-and-uncompress-dexs,$(_src),$(_fulldest))), \
-                $(if $(filter init%rc,$(notdir $(_dest)))$(filter %/etc/init,$(dir $(_dest))),\
+                $(if $(filter init%rc,$(notdir $(_dest)))$(filter %/etc/init/,$(dir $(_dest))),\
                    $(eval $(call copy-init-script-file-checked,$(_src),$(_fulldest))),\
                    $(if $(and $(filter true,$(check_elf_prebuilt_product_copy_files)), \
                               $(filter bin lib lib64,$(subst /,$(space),$(_dest)))), \
@ -2304,11 +2304,9 @@ $(if $(BOARD_$(_var)IMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "$(1)_squashfs_compr
 $(if $(BOARD_$(_var)IMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "$(1)_squashfs_compressor_opt=$(BOARD_$(_var)IMAGE_SQUASHFS_COMPRESSOR_OPT)" >> $(2))
 $(if $(BOARD_$(_var)IMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "$(1)_squashfs_disable_4k_align=$(BOARD_$(_var)IMAGE_SQUASHFS_DISABLE_4K_ALIGN)" >> $(2))
 $(if $(PRODUCT_$(_var)_BASE_FS_PATH),$(hide) echo "$(1)_base_fs_file=$(PRODUCT_$(_var)_BASE_FS_PATH)" >> $(2))
-$(if $(filter true,$(AB_OTA_UPDATER)),,\
-    $(eval _size := $(BOARD_$(_var)IMAGE_PARTITION_SIZE))
-    $(eval _reserved := $(BOARD_$(_var)IMAGE_PARTITION_RESERVED_SIZE))
-    $(eval _headroom := $(PRODUCT_$(_var)_HEADROOM))
-)
+$(eval _size := $(BOARD_$(_var)IMAGE_PARTITION_SIZE))
+$(eval _reserved := $(BOARD_$(_var)IMAGE_PARTITION_RESERVED_SIZE))
+$(eval _headroom := $(PRODUCT_$(_var)_HEADROOM))
 $(if $(or $(_size), $(_reserved), $(_headroom)),,
    $(hide) echo "$(1)_disable_sparse=true" >> $(2))
 $(call add-common-flags-to-image-props,$(1),$(2))
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@ -40,8 +40,10 @@ $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_DRMSERVER)
 $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)
 $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER)
 $(call add_soong_config_var,ANDROID,BOARD_GENFS_LABELS_VERSION)
+$(call soong_config_set_bool,ANDROID,PRODUCT_FSVERITY_GENERATE_METADATA,$(if $(filter true,$(PRODUCT_FSVERITY_GENERATE_METADATA)),true,false))

 $(call add_soong_config_var,ANDROID,ADDITIONAL_M4DEFS,$(if $(BOARD_SEPOLICY_M4DEFS),$(addprefix -D,$(BOARD_SEPOLICY_M4DEFS))))
+$(call add_soong_config_var,ANDROID,TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS)

 # For bootable/recovery
 RECOVERY_API_VERSION := 3
--- a/core/build_id.mk
+++ b/core/build_id.mk
@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.

-BUILD_ID=BP1A.250305.019
+BUILD_ID=BP1A.250305.020.T2
--- a/core/misc_prebuilt_internal.mk
+++ b/core/misc_prebuilt_internal.mk
@ -25,7 +25,7 @@ endif

 include $(BUILD_SYSTEM)/base_rules.mk

-ifneq ($(filter init%rc,$(notdir $(LOCAL_INSTALLED_MODULE)))$(filter %/etc/init,$(dir $(LOCAL_INSTALLED_MODULE))),)
+ifneq ($(filter init%rc,$(notdir $(LOCAL_INSTALLED_MODULE)))$(filter %/etc/init/,$(dir $(LOCAL_INSTALLED_MODULE))),)
  $(eval $(call copy-init-script-file-checked,$(my_prebuilt_src_file),$(LOCAL_BUILT_MODULE)))
 else
 $(LOCAL_BUILT_MODULE) : $(my_prebuilt_src_file)
--- a/envsetup.sh
+++ b/envsetup.sh
@ -482,11 +482,18 @@ function lunch()

    export TARGET_BUILD_APPS=

-    # This must be <product>-<release>-<variant>
+    # This must be <product>-[<release>]-<variant>
    local product release variant
    # Split string on the '-' character.
    IFS="-" read -r product release variant <<< "$selection"

+    if [[ -z "$variant" ]]
+    then
+        # try to lunch with latest release
+        variant=$release
+        # from https://github.com/yaap/build_make/blob/c7753b7616c75f020cd1bdb04fda05625d2649cc/envsetup.sh#L523
+        release=$(grep "BUILD_ID" build/make/core/build_id.mk | tail -1 | cut -d '=' -f 2 | cut -d '.' -f 1 | tr '[:upper:]' '[:lower:]')
+    fi
    if [[ -z "$product" ]] || [[ -z "$release" ]] || [[ -z "$variant" ]]
    then
        echo
--- a/target/board/generic_arm64/BoardConfig.mk
+++ b/target/board/generic_arm64/BoardConfig.mk
@ -66,6 +66,8 @@ include build/make/target/board/BoardConfigGsiCommon.mk
 BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
 BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist
 BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
+# for Android.bp
+TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS := true

 # TODO(b/36764215): remove this setting when the generic system image
 # no longer has QCOM-specific directories under /.
--- a/target/product/aosp_arm.mk
+++ b/target/product/aosp_arm.mk
@ -60,8 +60,12 @@ ifeq (aosp_arm,$(TARGET_PRODUCT))
 MODULE_BUILD_FROM_SOURCE ?= true

 $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
-endif

+PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image
+USE_SOONG_DEFINED_SYSTEM_IMAGE := true
+PRODUCT_USE_SOONG_NOTICE_XML := true
+
+endif

 PRODUCT_NAME := aosp_arm
 PRODUCT_DEVICE := generic
--- a/target/product/aosp_arm64.mk
+++ b/target/product/aosp_arm64.mk
@ -66,8 +66,12 @@ ifeq (aosp_arm64,$(TARGET_PRODUCT))
 MODULE_BUILD_FROM_SOURCE ?= true

 $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
-endif

+PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image
+USE_SOONG_DEFINED_SYSTEM_IMAGE := true
+PRODUCT_USE_SOONG_NOTICE_XML := true
+
+endif

 PRODUCT_NAME := aosp_arm64
 PRODUCT_DEVICE := generic_arm64
--- a/target/product/aosp_x86.mk
+++ b/target/product/aosp_x86.mk
@ -58,8 +58,12 @@ ifeq (aosp_x86,$(TARGET_PRODUCT))
 MODULE_BUILD_FROM_SOURCE ?= true

 $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
-endif

+PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image
+USE_SOONG_DEFINED_SYSTEM_IMAGE := true
+PRODUCT_USE_SOONG_NOTICE_XML := true
+
+endif

 PRODUCT_NAME := aosp_x86
 PRODUCT_DEVICE := generic_x86
--- a/target/product/aosp_x86_64.mk
+++ b/target/product/aosp_x86_64.mk
@ -68,8 +68,12 @@ ifeq (aosp_x86_64,$(TARGET_PRODUCT))
 MODULE_BUILD_FROM_SOURCE ?= true

 $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
-endif

+PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := aosp_system_image
+USE_SOONG_DEFINED_SYSTEM_IMAGE := true
+PRODUCT_USE_SOONG_NOTICE_XML := true
+
+endif

 PRODUCT_NAME := aosp_x86_64
 PRODUCT_DEVICE := generic_x86_64
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@ -127,6 +127,23 @@ android_symlinks = [
    },
 ]

+extra_vendor_symlinks = [
+    // Some vendors still haven't cleaned up all device specific directories under root!
+    // TODO(b/111434759, b/111287060) SoC specific hacks
+    {
+        target: "/vendor/lib/dsp",
+        name: "dsp",
+    },
+    {
+        target: "/mnt/vendor/persist",
+        name: "persist",
+    },
+    {
+        target: "/vendor/firmware_mnt",
+        name: "firmware",
+    },
+]
+
 filegroup {
    name: "generic_system_sign_key",
    srcs: [":avb_testkey_rsa4096"],
@ -347,17 +364,77 @@ phony {
 }

 android_filesystem_defaults {
-    name: "system_image_defaults",
-    partition_name: "system",
-    base_dir: "system",
-    dirs: generic_rootdirs,
-    symlinks: generic_symlinks,
-    file_contexts: ":plat_file_contexts",
-    linker_config: {
-        gen_linker_config: true,
-        linker_config_srcs: [":system_linker_config_json_file"],
-    },
-    fsverity: {
+    name: "system_ext_image_defaults",
+    deps: [
+        ///////////////////////////////////////////
+        // base_system_ext
+        ///////////////////////////////////////////
+        "build_flag_system_ext",
+        "fs_config_dirs_system_ext",
+        "fs_config_files_system_ext",
+        "group_system_ext",
+        "passwd_system_ext",
+        "SatelliteClient",
+        "selinux_policy_system_ext",
+        "system_ext_manifest.xml",
+        "system_ext-build.prop",
+        // Base modules when shipping api level is less than or equal to 34
+        "hwservicemanager",
+        "android.hidl.allocator@1.0-service",
+
+        ///////////////////////////////////////////
+        // window_extensions_base
+        ///////////////////////////////////////////
+        "androidx.window.extensions",
+        "androidx.window.sidecar",
+
+        ///////////////////////////////////////////
+        // base_system
+        ///////////////////////////////////////////
+        "charger",
+    ] + select(release_flag("RELEASE_APPFUNCTION_SIDECAR"), {
+        true: [
+            "com.android.extensions.appfunctions",
+            "appfunctions.extension.xml",
+        ],
+        default: [],
+    }),
+}
+
+android_filesystem_defaults {
+    name: "product_image_defaults",
+    deps: [
+        ///////////////////////////////////////////
+        // media_product
+        ///////////////////////////////////////////
+        "webview",
+
+        ///////////////////////////////////////////
+        // base_product
+        ///////////////////////////////////////////
+
+        // Base modules and settings for the product partition.
+        "build_flag_product",
+        "fs_config_dirs_product",
+        "fs_config_files_product",
+        "group_product",
+        "ModuleMetadata",
+        "passwd_product",
+        "product_compatibility_matrix.xml",
+        "product_manifest.xml",
+        "selinux_policy_product",
+        "product-build.prop",
+
+        // AUDIO
+        "frameworks_sounds",
+    ] + select(product_variable("debuggable"), {
+        // Packages included only for eng or userdebug builds, previously debug tagged
+        true: ["adb_keys"],
+        default: [],
+    }),
+}
+
+system_image_fsverity_default = {
    inputs: [
        "etc/boot-image.prof",
        "etc/classpaths/*.pb",
@ -368,6 +445,61 @@ android_filesystem_defaults {
        "framework/oat/*/*", // framework/oat/{arch}
    ],
    libs: [":framework-res{.export-package.apk}"],
+}
+
+soong_config_module_type {
+    name: "system_image_defaults",
+    module_type: "android_filesystem_defaults",
+    config_namespace: "ANDROID",
+    bool_variables: ["TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS"],
+    properties: ["symlinks"],
+}
+
+genrule {
+    name: "plat_and_vendor_file_contexts",
+    device_common_srcs: [
+        ":plat_file_contexts",
+        ":vendor_file_contexts",
+    ],
+    out: ["file_contexts"],
+    cmd: "cat $(in) > $(out)",
+}
+
+system_image_defaults {
+    name: "system_image_defaults",
+    partition_name: "system",
+    base_dir: "system",
+    dirs: generic_rootdirs,
+    soong_config_variables: {
+        TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS: {
+            symlinks: generic_symlinks + extra_vendor_symlinks,
+            conditions_default: {
+                symlinks: generic_symlinks,
+            },
+        },
+    },
+    file_contexts: ":plat_and_vendor_file_contexts",
+    linker_config: {
+        gen_linker_config: true,
+        linker_config_srcs: [":system_linker_config_json_file"],
+    },
+    fsverity: {
+        inputs: select(soong_config_variable("ANDROID", "PRODUCT_FSVERITY_GENERATE_METADATA"), {
+            true: [
+                "etc/boot-image.prof",
+                "etc/classpaths/*.pb",
+                "etc/dirty-image-objects",
+                "etc/preloaded-classes",
+                "framework/*",
+                "framework/*/*", // framework/{arch}
+                "framework/oat/*/*", // framework/oat/{arch}
+            ],
+            default: [],
+        }),
+        libs: select(soong_config_variable("ANDROID", "PRODUCT_FSVERITY_GENERATE_METADATA"), {
+            true: [":framework-res{.export-package.apk}"],
+            default: [],
+        }),
    },
    build_logtags: true,
    gen_aconfig_flags_pb: true,
@ -610,6 +742,11 @@ android_filesystem_defaults {
            "update_engine_client",
        ],
        default: [],
+    }) + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {
+        true: [],
+        default: [
+            "uprobestats", // base_system internal
+        ],
    }),
    multilib: {
        common: {
@ -762,12 +899,7 @@ android_filesystem_defaults {
                "android.system.virtualizationservice-ndk",
                "libgsi",
                "servicemanager",
-            ] + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {
-                true: [],
-                default: [
-                    "uprobestats", // base_system internal
            ],
-            }),
        },
        both: {
            deps: [
--- a/target/product/gsi/Android.bp
+++ b/target/product/gsi/Android.bp
@ -81,9 +81,13 @@ gsi_symlinks = [
    },
 ]

-android_system_image {
-    name: "android_gsi",
-    defaults: ["system_image_defaults"],
+android_filesystem_defaults {
+    name: "android_gsi_defaults",
+    defaults: [
+        "system_image_defaults",
+        "system_ext_image_defaults",
+        "product_image_defaults",
+    ],
    symlinks: gsi_symlinks,
    dirs: ["cache"],
    deps: [
@ -101,33 +105,6 @@ android_system_image {
        // telephony packages
        "CarrierConfig",

-        // Install a copy of the debug policy to the system_ext partition, and allow
-        // init-second-stage to load debug policy from system_ext.
-        // This option is only meant to be set by compliance GSI targets.
-        "system_ext_userdebug_plat_sepolicy.cil",
-
-        ///////////////////////////////////////////
-        // base_system_ext
-        ///////////////////////////////////////////
-        "build_flag_system_ext",
-        "fs_config_dirs_system_ext",
-        "fs_config_files_system_ext",
-        "group_system_ext",
-        "passwd_system_ext",
-        "SatelliteClient",
-        "selinux_policy_system_ext",
-        "system_ext_manifest.xml",
-        "system_ext-build.prop",
-        // Base modules when shipping api level is less than or equal to 34
-        "hwservicemanager",
-        "android.hidl.allocator@1.0-service",
-
-        ///////////////////////////////////////////
-        // window_extensions_base
-        ///////////////////////////////////////////
-        "androidx.window.extensions",
-        "androidx.window.sidecar",
-
        ///////////////////////////////////////////
        // gsi_release
        ///////////////////////////////////////////
@ -147,12 +124,6 @@ android_system_image {
        "com.android.vndk.v33",
        "com.android.vndk.v34",

-        ///////////////////////////////////////////
-        // AVF
-        ///////////////////////////////////////////
-        "com.android.compos",
-        "features_com.android.virt.xml",
-
        ///////////////////////////////////////////
        // gsi_product
        ///////////////////////////////////////////
@ -161,49 +132,80 @@ android_system_image {
        "Dialer",
        "LatinIME",
        "apns-full-conf.xml",
-
-        ///////////////////////////////////////////
-        // media_product
-        ///////////////////////////////////////////
-        "webview",
-
-        ///////////////////////////////////////////
-        // base_product
-        ///////////////////////////////////////////
-
-        // Base modules and settings for the product partition.
-        "build_flag_product",
-        "fs_config_dirs_product",
-        "fs_config_files_product",
-        "group_product",
-        "ModuleMetadata",
-        "passwd_product",
-        "product_compatibility_matrix.xml",
-        "product_manifest.xml",
-        "selinux_policy_product",
-        "product-build.prop",
-
-        // AUDIO
-        "frameworks_sounds",
-
-        ///////////////////////////////////////////
-        // base_system
-        ///////////////////////////////////////////
-        "charger",
-    ] + select(product_variable("debuggable"), {
-        // Packages included only for eng or userdebug builds, previously debug tagged
-        true: ["adb_keys"],
-        default: [],
-    }),
+    ],
    multilib: {
+        lib64: {
+            deps: [
+                ///////////////////////////////////////////
+                // AVF
+                ///////////////////////////////////////////
+                "com.android.compos",
+                "features_com.android.virt.xml",
+            ],
+        },
        both: {
            // PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34
            deps: ["android.hidl.memory@1.0-impl"],
        },
    },
+    type: "ext4",
+}
+
+// system.img for gsi_{arch} targets
+android_system_image {
+    name: "android_gsi",
+    defaults: ["android_gsi_defaults"],
    enabled: select(soong_config_variable("ANDROID", "PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"), {
        "true": true,
        default: false,
    }),
-    type: "ext4",
+    deps: [
+        // Install a copy of the debug policy to the system_ext partition, and allow
+        // init-second-stage to load debug policy from system_ext.
+        // This option is only meant to be set by compliance GSI targets.
+        "system_ext_userdebug_plat_sepolicy.cil",
+    ],
+}
+
+// system.img for aosp_{arch} targets
+android_system_image {
+    name: "aosp_system_image",
+    defaults: ["android_gsi_defaults"],
+    deps: [
+        // handheld_system_ext
+        "AccessibilityMenu",
+        "WallpaperCropper",
+
+        // telephony_system_ext
+        "EmergencyInfo",
+
+        // handheld_product
+        "Calendar",
+        "Contacts",
+        "DeskClock",
+        "Gallery2",
+        "Music",
+        "preinstalled-packages-platform-handheld-product.xml",
+        "QuickSearchBox",
+        "SettingsIntelligence",
+        "frameworks-base-overlays",
+
+        // telephony_product
+        "ImsServiceEntitlement",
+        "preinstalled-packages-platform-telephony-product.xml",
+
+        // more AOSP packages
+        "initial-package-stopped-states-aosp.xml",
+        "messaging",
+        "PhotoTable",
+        "preinstalled-packages-platform-aosp-product.xml",
+        "ThemePicker",
+    ] + select(product_variable("debuggable"), {
+        true: ["frameworks-base-overlays-debug"],
+        default: [],
+    }),
+    enabled: select(soong_config_variable("gsi", "building_gsi"), {
+        true: true,
+        default: false,
+    }),
 }
--- a/target/product/handheld_system.mk
+++ b/target/product/handheld_system.mk
@ -46,6 +46,7 @@ PRODUCT_PACKAGES += \
    CertInstaller \
    CredentialManager \
    DeviceAsWebcam \
+    DeviceDiagnostics \
    DocumentsUI \
    DownloadProviderUi \
    EasterEgg \
Author	SHA1	Message	Date
elpaablo	22cbd6054f	lunch: make release argument optional	2025-04-10 21:18:14 +00:00
Aaron Kling	bdf3474394	fixup! Reland: Verify init scripts for correctness during build The dir macro returns the path with a trailing slash. The copy-files and prebuilt filter checks for files in the etc/init directory did not have a trailing slash in the comparison string. Change-Id: If56e283ac33784514d4b715bb25d48c044c904cc	2025-04-05 13:53:28 +00:00
Inseob Kim	0fc8410b07	Fix uprobestats deps for 32-bit targets We must use `deps`, not `multilib.lib64`, because uprobestats is a native binary and we also consider 32-bit targets. Bug: 381019944 Test: build all aosp_{target} targets Change-Id: I001ac687ffc3874719ad9f685690b36729192aa0	2025-03-30 15:58:32 +02:00
Inseob Kim	219d8fdfaa	Revert^2 "Add soong module only for aosp_{arch}" This reverts commit c125acc4c502ef19479bdb8dda3b8ddc520199b1. Reason for revert: build breakage fixed with aosp/3486213 Change-Id: Iad7ee9ab188b2b387ec07d34cd6245aeb568ae4f	2025-03-30 15:58:27 +02:00
Inseob Kim	6a04b1f9a2	Add fsverity/compos only for 64-bit images Because AVF is shipped only on 64-bit devices. Bug: 381019944 Test: TH Change-Id: Icbf4656f9b830e6254024558e96fc3c5dae6113c	2025-03-30 15:46:39 +02:00
Inseob Kim	11d4e154ed	Add default modules for system_ext and product Also fixes gsi_x86_64_soong_system. Bug: 381019466 Test: build gsi_x86_64_soong_system Change-Id: Ib048f4b45ffa77a8ba41341426d6b42cea1549bd	2025-03-30 15:45:19 +02:00
Aaron Kling	9db2fb62fe	Revert "Disable sparse images for A/B updater targets" This reverts commit `a927af6775`. The original change breaks building vendor image for legacy A/B devices with a recovery partition. Because build checks the out image size plus the recovery patch size. If sparse images are disabled, then the output image size will always be the max size. And max size plus anything will always be greater than max size. Change-Id: I87dd2bf78e9080d1fc2d320df7e98ee98efa031c (cherry picked from commit 008ed588707f277e0e63f0b70d5fd6b598220e51)	2025-03-28 14:29:08 +00:00
Michael Bestas	ced4f33fe0	Android 15.0.0 Release 23 (BP1A.250305.020.T2) -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8fg+gAKCRDorT+BmrEO eALMAJ97eIFL19k52KFX7KHwMIeCWJGo6wCfX6OJIGfV96pGDIiN70XmvsA/1Hg= =cg11 -----END PGP SIGNATURE----- gpgsig -----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ +rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQLjL4A/7A76zgw6+ehYFMP3QOAmKOM2qqUV4anw74OBuK72DPlXDXJsuOfLRPPKRwt bSqwU6sZUaALiWRhNDcgE= -----END SSH SIGNATURE----- Merge tag 'android-15.0.0_r23' into staging/lineage-22.2_merge-android-15.0.0_r23 Android 15.0.0 Release 23 (BP1A.250305.020.T2) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8fg+gAKCRDorT+BmrEO # eALMAJ97eIFL19k52KFX7KHwMIeCWJGo6wCfX6OJIGfV96pGDIiN70XmvsA/1Hg= # =cg11 # -----END PGP SIGNATURE----- # gpg: Signature made Wed Mar 5 07:28:26 2025 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate] * tag 'android-15.0.0_r23': Version bump to BP1A.250305.020.T2 [core/build_id.mk] Version bump to BP1A.250305.020.T1 [core/build_id.mk] Change-Id: I090c9eaa4c0025dd018ad7085bb63c16a92833aa	2025-03-27 23:09:06 +02:00
Michael Bestas	bac9f13ff2	Android 15.0.0 Release 21 (BP1A.250305.020) -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8fKGQAKCRDorT+BmrEO ePJ/AJsGzx5AHh93SSuUxzGZFZ7OBR7nZQCcCVH4kiQVJaBvyiR7ERbzZXUTpnM= =zY3D -----END PGP SIGNATURE----- gpgsig -----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ +rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQDufPegC3mO/hQpovikwf1ntzGRlr2FcdR7Go1lWrZlAtQzyJFvpkXOPG0S/LqdNtI yH7ecu4eIB1Ap01+eiEQg= -----END SSH SIGNATURE----- Merge tag 'android-15.0.0_r21' into staging/lineage-22.2_merge-android-15.0.0_r21 Android 15.0.0 Release 21 (BP1A.250305.020) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8fKGQAKCRDorT+BmrEO # ePJ/AJsGzx5AHh93SSuUxzGZFZ7OBR7nZQCcCVH4kiQVJaBvyiR7ERbzZXUTpnM= # =zY3D # -----END PGP SIGNATURE----- # gpg: Signature made Wed Mar 5 05:50:49 2025 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate] * tag 'android-15.0.0_r21': Version bump to BP1A.250305.020 [core/build_id.mk] Version bump to BP1A.250305.019.W1 [core/build_id.mk] Change-Id: Ie7c32b112de59172255a144ec5bef529c5e893b0	2025-03-27 23:06:04 +02:00
Michael Bestas	5c84874c51	Reapply "Add DeviceDiagnostics.apk" This reverts commit `bcc9665149`. Change-Id: I2deb38e12282f0f29079e6ff7158f25184648c71	2025-03-22 01:37:05 +02:00
Android Build Coastguard Worker	3916a75115	Version bump to BP1A.250305.020.T2 [core/build_id.mk] Change-Id: I00ef69849067a04ffaaf6c1837541a5b35adebdd	2025-02-06 10:28:58 -08:00
Android Build Coastguard Worker	ae53e47efb	Version bump to BP1A.250305.020.T1 [core/build_id.mk] Change-Id: Ie88324935fb84bf5ecb647ca02b1e4f3aa9cdeeb	2025-02-04 12:43:53 -08:00
Android Build Coastguard Worker	4f0bb25f6f	Version bump to BP1A.250305.020 [core/build_id.mk] Change-Id: Ia2a6a74ecaa010118160da3207c3cbc706789b9e	2025-02-04 11:15:07 -08:00
Android Build Coastguard Worker	b64e54d2c6	[coastguard skipped] Merge sparse cherrypicks from sparse-13003188-L84000030009306061 into 25Q1-release. COASTGUARD_SKIP: I8f4e08bd87058215dec2a24e750f3b8d88f88d5c Change-Id: I3871d06975b47a82afe2c385886dd51f9a145fa5	2025-02-03 12:35:22 -08:00
Android Build Coastguard Worker	2941b03df1	Version bump to BP1A.250305.019.W1 [core/build_id.mk] Change-Id: I8f4e08bd87058215dec2a24e750f3b8d88f88d5c	2025-02-03 12:33:50 -08:00