commit f8079faaa50a80f4c173ef160b1bfbd71364f248
author Inseob Kim <inseob@google.com> Mon Apr 22 15:29:23 2024 +0900
committer Inseob Kim <inseob@google.com> Mon Apr 22 15:40:29 2024 +0900
tree 10844a9c18fcf80131617156d534ab208f229e87
parent 7ea1dd6dd1f553f0a6b928ce686e2eb6e44d5209

Fix BOARD_API_FROZEN conditions

Bug: 330670954
Test: m selinux_policy on frozen release
Change-Id: I494cd5afcd2f6014d19e2cd4061b4cc812a7dbc5

Android.mk

diff --git a/Android.mk b/Android.mk
index 5d2a208..09e253a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -212,7 +212,7 @@
 
 # HACK to support vendor blobs using 1000000.0
 # TODO(b/314010177): remove after new ToT (202404) fully propagates
-ifneq (true,$(BOARD_API_LEVEL_FROZEN))
+ifneq (true,$(RELEASE_BOARD_API_LEVEL_FROZEN))
 LOCAL_REQUIRED_MODULES += plat_mapping_file_1000000.0
 endif
 
@@ -254,7 +254,7 @@
 endif  # SELINUX_IGNORE_NEVERALLOWS
 endif  # with_asan
 
-ifeq ($(BOARD_API_LEVEL_FROZEN),true)
+ifeq ($(RELEASE_BOARD_API_LEVEL_FROZEN),true)
 LOCAL_REQUIRED_MODULES += \
     se_freeze_test
 endif
@@ -286,7 +286,7 @@
 
 # HACK to support vendor blobs using 1000000.0
 # TODO(b/314010177): remove after new ToT (202404) fully propagates
-ifneq (true,$(BOARD_API_LEVEL_FROZEN))
+ifneq (true,$(RELEASE_BOARD_API_LEVEL_FROZEN))
 LOCAL_REQUIRED_MODULES += system_ext_mapping_file_1000000.0
 endif
 
@@ -340,7 +340,7 @@
 
 # HACK to support vendor blobs using 1000000.0
 # TODO(b/314010177): remove after new ToT (202404) fully propagates
-ifneq (true,$(BOARD_API_LEVEL_FROZEN))
+ifneq (true,$(RELEASE_BOARD_API_LEVEL_FROZEN))
 LOCAL_REQUIRED_MODULES += product_mapping_file_1000000.0
 endif