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

Commit 769add0c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Make change and version bump to AP3A.240217.001 

Snap for 11463929 from 63d4b06b to 24Q3-release

Change-Id: Ia85eec412b4cde1028a6d91c1dc29f634c20babf
parents 211fafbf 63d4b06b

core/Makefile

+7 −4
Original line number Diff line number Diff line
@@ -5109,8 +5109,10 @@ ifneq (,$(filter EMPTY_VENDOR_SKU_PLACEHOLDER,$(DEVICE_MANIFEST_SKUS))) 
$(error EMPTY_VENDOR_SKU_PLACEHOLDER is an internal variable and cannot be used for DEIVCE_MANIFEST_SKUS)

endif



# -- Check system manifest / matrix including fragments (excluding other framework manifests / matrices, e.g. product);

check_vintf_system_deps := $(filter $(TARGET_OUT)/etc/vintf/%, $(check_vintf_common_srcs))

# -- Check system and system_ext manifests / matrices including fragments (excluding other framework manifests / matrices, e.g. product);

check_vintf_system_deps := $(filter $(TARGET_OUT)/etc/vintf/% \

                                    $(TARGET_OUT_SYSTEM_EXT)/etc/vintf/%, \

                                    $(check_vintf_common_srcs))

ifneq ($(check_vintf_system_deps),)

check_vintf_has_system := true
@@ -5138,8 +5140,9 @@ endif # check_vintf_system_deps 
check_vintf_system_deps :=



# -- Check vendor manifest / matrix including fragments (excluding other device manifests / matrices)

check_vintf_vendor_deps := $(filter $(TARGET_OUT_VENDOR)/etc/vintf/%, $(check_vintf_common_srcs))

check_vintf_vendor_deps += $(filter $(TARGET_OUT_VENDOR)/apex/%, $(check_vintf_common_srcs))

check_vintf_vendor_deps := $(filter $(TARGET_OUT_VENDOR)/etc/vintf/% \

                                    $(TARGET_OUT_VENDOR)/apex/%, \

                                    $(check_vintf_common_srcs))

ifneq ($(strip $(check_vintf_vendor_deps)),)

check_vintf_has_vendor := true

check_vintf_vendor_log := $(intermediates)/check_vintf_vendor.log

core/android_soong_config_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ $(call add_soong_config_var_value,ANDROID,release_avf_enable_multi_tenant_microd 
$(call add_soong_config_var_value,ANDROID,release_avf_enable_remote_attestation,$(RELEASE_AVF_ENABLE_REMOTE_ATTESTATION))

$(call add_soong_config_var_value,ANDROID,release_avf_enable_vendor_modules,$(RELEASE_AVF_ENABLE_VENDOR_MODULES))

$(call add_soong_config_var_value,ANDROID,release_avf_enable_virt_cpufreq,$(RELEASE_AVF_ENABLE_VIRT_CPUFREQ))

$(call add_soong_config_var_value,ANDROID,release_avf_microdroid_kernel_version,$(RELEASE_AVF_MICRODROID_KERNEL_VERSION))



$(call add_soong_config_var_value,ANDROID,release_binder_death_recipient_weak_from_jni,$(RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI))

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=AP3A.240216.001
 
BUILD_ID=AP3A.240217.001

target/product/fullmte.mk

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
# For more details, see:

# https://source.android.com/docs/security/test/memory-safety/arm-mte

ifeq ($(filter memtag_heap,$(SANITIZE_TARGET)),)

  # TODO(b/292478827): Re-enable memtag_stack when new toolchain rolls.

  SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap)

  SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap memtag_stack)

  SANITIZE_TARGET_DIAG := $(strip $(SANITIZE_TARGET_DIAG) memtag_heap)

endif

PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync

tools/characteristics_rro_generator.py

+3 −11
Original line number Diff line number Diff line 
#!/usr/bin/env python3

import sys

from xml.dom.minidom import parseString



def parse_package(manifest):

    with open(manifest, 'r') as f:

        data = f.read()

    dom = parseString(data)

    return dom.documentElement.getAttribute('package')



if __name__ == '__main__':

    if len(sys.argv) != 3:

        sys.exit(f"usage: {sys_argv[0]} target_package_manifest output\n")

    package_name = parse_package(sys.argv[1])

        sys.exit(f"usage: {sys_argv[0]} target_package_name output\n")

    with open(sys.argv[2], "w") as f:

        f.write(f'''<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="{package_name}.auto_generated_characteristics_rro">

                <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="{sys.argv[1]}.auto_generated_characteristics_rro">

    <application android:hasCode="false" />

    <overlay android:targetPackage="{package_name}"

    <overlay android:targetPackage="{sys.argv[1]}"

             android:isStatic="true"

             android:priority="0" />

</manifest>