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

Commit 9d4b3b86 authored by Juan Yescas's avatar Juan Yescas Committed by Automerger Merge Worker
Browse files

Merge "16k: core: Add flag to make AOSP page size agnostic" into main am: a5043704

parents 5acec2b7 a5043704
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -425,6 +425,7 @@ ifdef PRODUCT_SHIPPING_API_LEVEL
endif

# Set TARGET_MAX_PAGE_SIZE_SUPPORTED.
# TARGET_MAX_PAGE_SIZE_SUPPORTED indicates the alignment of the ELF segments.
ifdef PRODUCT_MAX_PAGE_SIZE_SUPPORTED
  TARGET_MAX_PAGE_SIZE_SUPPORTED := $(PRODUCT_MAX_PAGE_SIZE_SUPPORTED)
else ifeq ($(strip $(call is-low-mem-device)),true)
@@ -440,6 +441,19 @@ else
endif
.KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED

# Boolean variable determining if AOSP is page size agnostic. This means
# that AOSP can use a kernel configured with 4k/16k/64k PAGE SIZES.
TARGET_PAGE_SIZE_AGNOSTIC := false
ifdef PRODUCT_PAGE_SIZE_AGNOSTIC
  TARGET_PAGE_SIZE_AGNOSTIC := $(PRODUCT_PAGE_SIZE_AGNOSTIC)
  ifeq ($(TARGET_PAGE_SIZE_AGNOSTIC),true)
      ifneq ($(TARGET_MAX_PAGE_SIZE_SUPPORTED),65536)
          $(error TARGET_MAX_PAGE_SIZE_SUPPORTED has to be 65536 to support page size agnostic)
      endif
  endif
endif
.KATI_READONLY := TARGET_PAGE_SIZE_AGNOSTIC

# Pruned directory options used when using findleaves.py
# See envsetup.mk for a description of SCAN_EXCLUDE_DIRS
FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git)
+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ _product_single_value_vars += PRODUCT_MODEL_FOR_ATTESTATION
# 4096, 16384 and 65536.
_product_single_value_vars += PRODUCT_MAX_PAGE_SIZE_SUPPORTED

# Indicates that AOSP can use a kernel configured with 4k/16k/64k page sizes.
# The possible values are true or false.
_product_single_value_vars += PRODUCT_PAGE_SIZE_AGNOSTIC

# The resource configuration options to use for this product.
_product_list_vars += PRODUCT_LOCALES
_product_list_vars += PRODUCT_AAPT_CONFIG
+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ $(call add_json_bool, Malloc_zero_contents, $(call invert_bool,$(fi
$(call add_json_bool, Malloc_pattern_fill_contents,      $(MALLOC_PATTERN_FILL_CONTENTS))
$(call add_json_str,  Override_rs_driver,                $(OVERRIDE_RS_DRIVER))
$(call add_json_str,  DeviceMaxPageSizeSupported,        $(TARGET_MAX_PAGE_SIZE_SUPPORTED))
$(call add_json_bool, Device_page_size_agnostic,         $(filter true,$(TARGET_PAGE_SIZE_AGNOSTIC)))

$(call add_json_bool, UncompressPrivAppDex,              $(call invert_bool,$(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))))
$(call add_json_list, ModulesLoadedByPrivilegedModules,  $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))