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

Commit 1c9f82f8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Make change and version bump to AP3A.240606.001 

Snap for 11931036 from c25b4516 to 24Q3-release

Change-Id: I407c5120bd6361ce1445fb09c1fa0e834ff3e8d6
parents 81da983b c25b4516

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.240605.003
 
BUILD_ID=AP3A.240606.001

core/check_elf_file.mk

+19 −0
Original line number Diff line number Diff line
@@ -7,9 +7,12 @@ 
#

# Inputs:

# - LOCAL_ALLOW_UNDEFINED_SYMBOLS

# - LOCAL_IGNORE_MAX_PAGE_SIZE

# - LOCAL_BUILT_MODULE

# - LOCAL_IS_HOST_MODULE

# - LOCAL_MODULE_CLASS

# - TARGET_CHECK_PREBUILT_MAX_PAGE_SIZE

# - TARGET_MAX_PAGE_SIZE_SUPPORTED

# - intermediates

# - my_installed_module_stem

# - my_prebuilt_src_file
@@ -26,6 +29,21 @@ $(check_elf_files_stamp): PRIVATE_SYSTEM_SHARED_LIBRARIES := $(my_system_shared_ 
# In addition to $(my_check_elf_file_shared_lib_files), some file paths are

# added by `resolve-shared-libs-for-elf-file-check` from `core/main.mk`.

$(check_elf_files_stamp): PRIVATE_SHARED_LIBRARY_FILES := $(my_check_elf_file_shared_lib_files)



# For different page sizes to work, we must support a larger max page size

# as well as properly reflect page size at runtime. Limit this check, since many

# devices set the max page size (for future proof) than actually use the

# larger page size.

ifeq ($(strip $(TARGET_CHECK_PREBUILT_MAX_PAGE_SIZE)),true)

ifeq ($(strip $(LOCAL_IGNORE_MAX_PAGE_SIZE)),true)

$(check_elf_files_stamp): PRIVATE_MAX_PAGE_SIZE :=

else

$(check_elf_files_stamp): PRIVATE_MAX_PAGE_SIZE := $(TARGET_MAX_PAGE_SIZE_SUPPORTED)

endif

else

$(check_elf_files_stamp): PRIVATE_MAX_PAGE_SIZE :=

endif



$(check_elf_files_stamp): $(my_prebuilt_src_file) $(my_check_elf_file_shared_lib_files) $(CHECK_ELF_FILE) $(LLVM_READOBJ)

	@echo Check prebuilt ELF binary: $<

	$(hide) mkdir -p $(dir $@)
@@ -33,6 +51,7 @@ $(check_elf_files_stamp): $(my_prebuilt_src_file) $(my_check_elf_file_shared_lib 
	$(hide) $(CHECK_ELF_FILE) \

	    --skip-bad-elf-magic \

	    --skip-unknown-elf-machine \

	    $(if $(PRIVATE_MAX_PAGE_SIZE),--max-page-size=$(PRIVATE_MAX_PAGE_SIZE)) \

	    $(if $(PRIVATE_SONAME),--soname $(PRIVATE_SONAME)) \

	    $(foreach l,$(PRIVATE_SHARED_LIBRARY_FILES),--shared-lib $(l)) \

	    $(foreach l,$(PRIVATE_SYSTEM_SHARED_LIBRARIES),--system-shared-lib $(l)) \

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ LOCAL_GTEST:=true 
LOCAL_HEADER_LIBRARIES:=

LOCAL_HOST_PREFIX:=

LOCAL_HOST_REQUIRED_MODULES:=

LOCAL_IGNORE_MAX_PAGE_SIZE:=

LOCAL_INIT_RC:=

LOCAL_INJECT_BSSL_HASH:=

LOCAL_INSTALLED_MODULE:=

core/config.mk

+7 −0
Original line number Diff line number Diff line
@@ -419,6 +419,13 @@ else 
endif

.KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED



ifdef PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE

  TARGET_CHECK_PREBUILT_MAX_PAGE_SIZE := $(PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE)

else

  TARGET_CHECK_PREBUILT_MAX_PAGE_SIZE := false

endif

.KATI_READONLY := TARGET_CHECK_PREBUILT_MAX_PAGE_SIZE



# Boolean variable determining if AOSP relies on bionic's PAGE_SIZE macro.

ifdef PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO

  TARGET_NO_BIONIC_PAGE_SIZE_MACRO := $(PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO)

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ _product_single_value_vars += PRODUCT_MODEL_FOR_ATTESTATION 
# PRODUCT_MAX_PAGE_SIZE_SUPPORTED=65536, the possible values for PAGE_SIZE could be

# 4096, 16384 and 65536.

_product_single_value_vars += PRODUCT_MAX_PAGE_SIZE_SUPPORTED

_product_single_value_vars += PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE



# Boolean variable determining if AOSP relies on bionic's PAGE_SIZE macro.

_product_single_value_vars += PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO