diff --git a/tools/finalization/environment.sh b/tools/finalization/environment.sh index d9c42c8bf9..b2d75bbcfc 100755 --- a/tools/finalization/environment.sh +++ b/tools/finalization/environment.sh @@ -23,4 +23,7 @@ export FINAL_MAINLINE_EXTENSION='58' # 'rel' - branch is finalized, switched to REL export FINAL_STATE='unfinalized' -export BUILD_FROM_SOURCE_STUB=true \ No newline at end of file +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) diff --git a/tools/finalization/finalize-sdk-rel.sh b/tools/finalization/finalize-sdk-rel.sh index 11fb90ccab..59fe28cb46 100755 --- a/tools/finalization/finalize-sdk-rel.sh +++ b/tools/finalization/finalize-sdk-rel.sh @@ -40,9 +40,6 @@ function finalize_sdk_rel() { fi 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 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/" diff --git a/tools/finalization/finalize-vintf-resources.sh b/tools/finalization/finalize-vintf-resources.sh index 88645b3ad5..362d9f7ed4 100755 --- a/tools/finalization/finalize-vintf-resources.sh +++ b/tools/finalization/finalize-vintf-resources.sh @@ -7,16 +7,15 @@ function finalize_vintf_resources() { source $top/build/make/tools/finalization/environment.sh # 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 # 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" 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() {