commit 9d5066b5f2fcddac227e9a0a84dfc9dfdfda2110
author Inseob Kim <inseob@google.com> Fri Jan 19 21:28:09 2024 +0900
committer Inseob Kim <inseob@google.com> Tue Jan 30 03:34:56 2024 +0000
tree d1ea0efe72603789a4b9634a7ec2ebe4ea86aef3
parent 9836b84f99d35e29ad5f915208a1ceb47a91379a

Move sepolicy finalization to vintf

Ignore-AOSP-First: b/304316873#comment10

Bug: 314010177
Test: ABTD run with fina-1 and fina-2
Change-Id: I5324eb0c619b9d3ddc5fcda0ce52f614f8596f6c

tools/finalization/environment.sh

diff --git a/tools/finalization/environment.sh b/tools/finalization/environment.sh
index d9c42c8..b2d75bb 100755
--- a/tools/finalization/environment.sh
+++ b/tools/finalization/environment.sh
@@ -23,4 +23,7 @@
 # '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)

tools/finalization/finalize-sdk-rel.sh

diff --git a/tools/finalization/finalize-sdk-rel.sh b/tools/finalization/finalize-sdk-rel.sh
index 11fb90c..59fe28c 100755
--- a/tools/finalization/finalize-sdk-rel.sh
+++ b/tools/finalization/finalize-sdk-rel.sh
@@ -40,9 +40,6 @@
     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/"

tools/finalization/finalize-vintf-resources.sh

diff --git a/tools/finalization/finalize-vintf-resources.sh b/tools/finalization/finalize-vintf-resources.sh
index 88645b3..362d9f7 100755
--- a/tools/finalization/finalize-vintf-resources.sh
+++ b/tools/finalization/finalize-vintf-resources.sh
@@ -7,16 +7,15 @@
     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() {