StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use RELEASE_BOARD_API_LEVEL_FROZEN" into main am: 04acb6d255

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2919149

Change-Id: I33f48fb9f73eb6b5159d3f6cec0e021848a4377a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-01-23 05:12:00 +00:00
committed by Automerger Merge Worker
parent c917c46314 04acb6d255
commit 23265631b2
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/board_config.mk
View File

@@ -994,11 +994,6 @@ ifdef RELEASE_BOARD_API_LEVEL
endif endif
BOARD_API_LEVEL := $(RELEASE_BOARD_API_LEVEL) BOARD_API_LEVEL := $(RELEASE_BOARD_API_LEVEL)
.KATI_READONLY := 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 endif
########################################### ###########################################

2
core/config.mk
View File

@@ -896,7 +896,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))
sepolicy_vers := $(BOARD_API_LEVEL).0 sepolicy_vers := $(BOARD_API_LEVEL).0
TOT_SEPOLICY_VERSION := 1000000.0 TOT_SEPOLICY_VERSION := 1000000.0
ifeq (true,$(BOARD_API_LEVEL_FROZEN)) ifeq (true,$(RELEASE_BOARD_API_LEVEL_FROZEN))
PLATFORM_SEPOLICY_VERSION := $(sepolicy_vers) PLATFORM_SEPOLICY_VERSION := $(sepolicy_vers)
else else
PLATFORM_SEPOLICY_VERSION := $(TOT_SEPOLICY_VERSION) PLATFORM_SEPOLICY_VERSION := $(TOT_SEPOLICY_VERSION)

6
core/main.mk
View File

@@ -311,10 +311,10 @@ ifdef BOARD_API_LEVEL
ADDITIONAL_VENDOR_PROPERTIES += \ ADDITIONAL_VENDOR_PROPERTIES += \
ro.board.api_level=$(BOARD_API_LEVEL) ro.board.api_level=$(BOARD_API_LEVEL)
endif endif
# BOARD_API_LEVEL_FROZEN is true when the vendor API surface is frozen. # RELEASE_BOARD_API_LEVEL_FROZEN is true when the vendor API surface is frozen.
ifdef BOARD_API_LEVEL_FROZEN ifdef RELEASE_BOARD_API_LEVEL_FROZEN
ADDITIONAL_VENDOR_PROPERTIES += \ ADDITIONAL_VENDOR_PROPERTIES += \
ro.board.api_frozen=$(BOARD_API_LEVEL_FROZEN) ro.board.api_frozen=$(RELEASE_BOARD_API_LEVEL_FROZEN)
endif endif
# Set build prop. This prop is read by ota_from_target_files when generating OTA, # Set build prop. This prop is read by ota_from_target_files when generating OTA,