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

Commit b33308c8 authored by Justin Yun's avatar Justin Yun
Browse files

Use RELEASE_BOARD_API_LEVEL_FROZEN 

RELEASE_BOARD_API_LEVEL_FROZEN must not be overriden by a board
config value. Use RELEASE_BOARD_API_LEVEL_FROZEN directly to build
configs.

Bug: 295269182
Test: TH
Change-Id: I60ad4cf1a9f377619fef98d6f9ef4d04d3395991
parent b14bf5f6

core/board_config.mk

+0 −5
Original line number Diff line number Diff line
@@ -994,11 +994,6 @@ ifdef RELEASE_BOARD_API_LEVEL 
  endif

  BOARD_API_LEVEL := $(RELEASE_BOARD_API_LEVEL)

  .KATI_READONLY := BOARD_API_LEVEL



  ifdef RELEASE_BOARD_API_LEVEL_FROZEN

    BOARD_API_LEVEL_FROZEN := true

    .KATI_READONLY := BOARD_API_LEVEL_FROZEN

  endif

endif



###########################################

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE)) 
sepolicy_vers := $(BOARD_API_LEVEL).0



TOT_SEPOLICY_VERSION := 1000000.0

ifeq (true,$(BOARD_API_LEVEL_FROZEN))

ifeq (true,$(RELEASE_BOARD_API_LEVEL_FROZEN))

    PLATFORM_SEPOLICY_VERSION := $(sepolicy_vers)

else

    PLATFORM_SEPOLICY_VERSION := $(TOT_SEPOLICY_VERSION)

core/main.mk

+3 −3
Original line number Diff line number Diff line
@@ -311,10 +311,10 @@ ifdef BOARD_API_LEVEL 
ADDITIONAL_VENDOR_PROPERTIES += \

    ro.board.api_level=$(BOARD_API_LEVEL)

endif

# BOARD_API_LEVEL_FROZEN is true when the vendor API surface is frozen.

ifdef BOARD_API_LEVEL_FROZEN

# RELEASE_BOARD_API_LEVEL_FROZEN is true when the vendor API surface is frozen.

ifdef RELEASE_BOARD_API_LEVEL_FROZEN

ADDITIONAL_VENDOR_PROPERTIES += \

    ro.board.api_frozen=$(BOARD_API_LEVEL_FROZEN)

    ro.board.api_frozen=$(RELEASE_BOARD_API_LEVEL_FROZEN)

endif



# Set build prop. This prop is read by ota_from_target_files when generating OTA,