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

Commit 88deb2f3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add warning for modifying the vendor api level." into main am: 045a3d6a 

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



Change-Id: Id8bffda3907b26075fbb99514a623244fdd0f55d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8c2c7c6 045a3d6a

core/product.mk

+0 −3
Original line number Diff line number Diff line
@@ -230,9 +230,6 @@ _product_single_value_vars += PRODUCT_SYSTEM_DLKM_BASE_FS_PATH 
# The first API level this product shipped with

_product_single_value_vars += PRODUCT_SHIPPING_API_LEVEL



# The first vendor API level this product shipped with

_product_single_value_vars += PRODUCT_SHIPPING_VENDOR_API_LEVEL



_product_list_vars += VENDOR_PRODUCT_RESTRICT_VENDOR_FILES

_product_list_vars += VENDOR_EXCEPTION_MODULES

_product_list_vars += VENDOR_EXCEPTION_PATHS

core/product_config.mk

+16 −19
Original line number Diff line number Diff line
@@ -609,10 +609,6 @@ ifneq ($(call sdk-to-vendor-api-level,10000),10000000) 
$(error sdk-to-vendor-api-level is broken for current $(call sdk-to-vendor-api-level,10000))

endif



ifdef PRODUCT_SHIPPING_VENDOR_API_LEVEL

# Follow the version that is set manually.

  VSR_VENDOR_API_LEVEL := $(PRODUCT_SHIPPING_VENDOR_API_LEVEL)

else

# VSR API level is the vendor api level of the product shipping API level.

VSR_VENDOR_API_LEVEL := $(call sdk-to-vendor-api-level,$(PLATFORM_SDK_VERSION))

ifdef PRODUCT_SHIPPING_API_LEVEL
@@ -624,12 +620,13 @@ else 
  # and RELEASE_BOARD_API_LEVEL

  board_api_level := $(RELEASE_BOARD_API_LEVEL)

  ifdef BOARD_API_LEVEL_PROP_OVERRIDE

    # This must be used only for testing purpose. Product must not be released

    # with the modified api level value.

    board_api_level := $(BOARD_API_LEVEL_PROP_OVERRIDE)

  endif

  VSR_VENDOR_API_LEVEL := $(call math_min,$(VSR_VENDOR_API_LEVEL),$(board_api_level))

  board_api_level :=

endif

endif

.KATI_READONLY := VSR_VENDOR_API_LEVEL



# Boolean variable determining if vendor seapp contexts is enforced

core/soong_extra_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ $(call add_json_str, SecondaryDex2oatInstructionSetFeatures, $($(TARGET_2ND_ARCH 
$(call add_json_str, BoardPlatform,          $(TARGET_BOARD_PLATFORM))

$(call add_json_str, BoardShippingApiLevel,  $(BOARD_SHIPPING_API_LEVEL))

$(call add_json_str, ShippingApiLevel,       $(PRODUCT_SHIPPING_API_LEVEL))

$(call add_json_str, ShippingVendorApiLevel, $(PRODUCT_SHIPPING_VENDOR_API_LEVEL))



$(call add_json_str, ProductModel,                      $(PRODUCT_MODEL))

$(call add_json_str, ProductModelForAttestation,        $(PRODUCT_MODEL_FOR_ATTESTATION))

core/sysprop_config.mk

+8 −2
Original line number Diff line number Diff line
@@ -69,8 +69,11 @@ ADDITIONAL_VENDOR_PROPERTIES += \ 
endif



ifdef PRODUCT_SHIPPING_VENDOR_API_LEVEL

ADDITIONAL_VENDOR_PROPERTIES += \

    ro.vendor.api_level=$(PRODUCT_SHIPPING_VENDOR_API_LEVEL)

# PRODUCT_SHIPPING_VENDOR_API_LEVEL was used to set ro.vendor.api_level

# manually for testing. To prevent using this variable for product release,

# remove this variable and show an error message.

$(error PRODUCT_SHIPPING_VENDOR_API_LEVEL is not available. ro.vendor.api_level\

  property must not be set manually)

endif



ifneq ($(TARGET_BUILD_VARIANT),user)
@@ -94,6 +97,9 @@ ifdef BOARD_API_LEVEL 
  ADDITIONAL_VENDOR_PROPERTIES += \

    ro.board.api_level?=$(BOARD_API_LEVEL)

  ifdef BOARD_API_LEVEL_PROP_OVERRIDE

    # This must be used only for testing purpose. Product must not be released

    # with the modified api level value.

    $(warning BOARD_API_LEVEL_PROP_OVERRIDE can be defined only for testing purpose)

    ADDITIONAL_VENDOR_PROPERTIES += \

      ro.board.api_level=$(BOARD_API_LEVEL_PROP_OVERRIDE)

  endif