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

Commit 9843c389 authored by Vilas Bhat's avatar Vilas Bhat Committed by Automerger Merge Worker
Browse files

Merge changes from topic "update-no-bionic-page-size" into main am: f28fa571... 

Merge changes from topic "update-no-bionic-page-size" into main am: f28fa571 am: e8c4ae90 am: 98ca0096

Original change: https://android-review.googlesource.com/c/platform/build/+/2859825



Change-Id: I0f5d348efdc7c24e4294440d782b413a65b1f922
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94a191c1 98ca0096

core/config.mk

+5 −5
Original line number Diff line number Diff line
@@ -436,16 +436,16 @@ endif 


# 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)

TARGET_NO_BIONIC_PAGE_SIZE_MACRO := false

ifdef PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO

  TARGET_NO_BIONIC_PAGE_SIZE_MACRO := $(PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO)

  ifeq ($(TARGET_NO_BIONIC_PAGE_SIZE_MACRO),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

.KATI_READONLY := TARGET_NO_BIONIC_PAGE_SIZE_MACRO



# Pruned directory options used when using findleaves.py

# See envsetup.mk for a description of SCAN_EXCLUDE_DIRS

core/product.mk

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ _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

_product_single_value_vars += PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO



# The resource configuration options to use for this product.

_product_list_vars += PRODUCT_LOCALES

core/soong_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,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, DevicePageSizeAgnostic,            $(filter true,$(TARGET_PAGE_SIZE_AGNOSTIC)))

$(call add_json_bool, DeviceNoBionicPageSizeMacro,       $(filter true,$(TARGET_NO_BIONIC_PAGE_SIZE_MACRO)))



$(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))