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

Move sepolicy finalization to vintf

Browse Source 
Ignore-AOSP-First: b/304316873#comment10

Bug: 314010177
Test: ABTD run with fina-1 and fina-2
Change-Id: I5324eb0c619b9d3ddc5fcda0ce52f614f8596f6c
This commit is contained in:
Inseob Kim
2024-01-19 21:28:09 +09:00
parent 9836b84f99
commit 9d5066b5f2
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/finalization/environment.sh
View File

@@ -23,4 +23,7 @@ export FINAL_MAINLINE_EXTENSION='58'
# 'rel' - branch is finalized, switched to REL # 'rel' - branch is finalized, switched to REL
export FINAL_STATE='unfinalized' export FINAL_STATE='unfinalized'
export BUILD_FROM_SOURCE_STUB=true export BUILD_FROM_SOURCE_STUB=true
# FINAL versions for VINTF
export FINAL_BOARD_API_LEVEL=$(TARGET_RELEASE=fina_1 $top/build/soong/soong_ui.bash --dumpvar-mode RELEASE_BOARD_API_LEVEL)

3
tools/finalization/finalize-sdk-rel.sh
View File

@@ -40,9 +40,6 @@ function finalize_sdk_rel() {
fi fi
git -C "$top/cts" mv hostsidetests/theme/assets/${FINAL_PLATFORM_CODENAME} hostsidetests/theme/assets/${FINAL_PLATFORM_SDK_VERSION} git -C "$top/cts" mv hostsidetests/theme/assets/${FINAL_PLATFORM_CODENAME} hostsidetests/theme/assets/${FINAL_PLATFORM_SDK_VERSION}
# system/sepolicy
system/sepolicy/tools/finalize-sdk-rel.sh "$top" "$FINAL_PLATFORM_SDK_VERSION"
# prebuilts/abi-dumps/platform # prebuilts/abi-dumps/platform
mkdir -p "$top/prebuilts/abi-dumps/platform/$FINAL_PLATFORM_SDK_VERSION" mkdir -p "$top/prebuilts/abi-dumps/platform/$FINAL_PLATFORM_SDK_VERSION"
cp -r "$top/prebuilts/abi-dumps/platform/current/64/" "$top/prebuilts/abi-dumps/platform/$FINAL_PLATFORM_SDK_VERSION/" cp -r "$top/prebuilts/abi-dumps/platform/current/64/" "$top/prebuilts/abi-dumps/platform/$FINAL_PLATFORM_SDK_VERSION/"

7
tools/finalization/finalize-vintf-resources.sh
View File

@@ -7,16 +7,15 @@ function finalize_vintf_resources() {
source $top/build/make/tools/finalization/environment.sh source $top/build/make/tools/finalization/environment.sh
# TODO(b/314010764): finalize LL_NDK # TODO(b/314010764): finalize LL_NDK
# TODO(b/314010177): finalize SELinux
# system/sepolicy
system/sepolicy/tools/finalize-vintf-resources.sh "$top" "$FINAL_BOARD_API_LEVEL"
create_new_compat_matrix create_new_compat_matrix
# pre-finalization build target (trunk) # pre-finalization build target (trunk)
local aidl_m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_RELEASE=trunk TARGET_BUILD_VARIANT=userdebug DIST_DIR=out/dist" local aidl_m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_RELEASE=trunk TARGET_BUILD_VARIANT=userdebug DIST_DIR=out/dist"
AIDL_TRANSITIVE_FREEZE=true $aidl_m aidl-freeze-api AIDL_TRANSITIVE_FREEZE=true $aidl_m aidl-freeze-api
# build/make
sed -i -e "s/sepolicy_major_vers := .*/sepolicy_major_vers := ${FINAL_PLATFORM_SDK_VERSION}/g" "$top/build/make/core/config.mk"
} }
function create_new_compat_matrix() { function create_new_compat_matrix() {