commit feb92b24d6af880e8e5c7be8b70ff1b41b9e7874
author qinglin.li <qinglin.li@amlogic.com> Thu Aug 24 10:07:24 2023 +0800
committer gerrit autosubmit <gerrit.autosubmit@amlogic.com> Tue Aug 29 03:59:05 2023 -0700
tree 1e3eb71b1a65321864734d320c2b57e75d0396c2
parent fa2e93cd370fe4680767c451256ddb12ef2cde46

module: add modules out add and remove function [1/2]

PD#SWPL-134106

Problem:
add modules out add and remove function

Solution:
add modules out add and remove function

Verify:
local

Change-Id: I836b63a2074b9bc480627da690d9c4240104e729
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>

modules.bzl

diff --git a/modules.bzl b/modules.bzl
index c01bbe9..0340dd7 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 load("//common:common_drivers/project/project.bzl", "ANDROID_PROJECT", "GKI_CONFIG", "UPGRADE_PROJECT")
-load("//common:common_drivers/project/project.bzl", "VENDOR_MODULES_REMOVE", "VENDOR_MODULES_ADD")
+load("//common:common_drivers/project/project.bzl", "MODULES_OUT_REMOVE", "MODULES_OUT_ADD")
 
 OEM_PROJECT_MODULES = [
 
@@ -238,15 +238,15 @@
 		 AMLOGIC_UPGRADE_P_MODULES if UPGRADE_PROJECT == "p" or UPGRADE_PROJECT == "P" else \
 		 AMLOGIC_UPGRADE_U_MODULES if UPGRADE_PROJECT == "u" or UPGRADE_PROJECT == "U" else \
 		 AMLOGIC_COMMON_MODULES
-ALL_MODULES = COMMON_MODULES + AMLOGIC_GKIX_MODULES + VENDOR_MODULES_ADD + AMLOGIC_MODULES_ANDROID if ANDROID_PROJECT else \
-	      COMMON_MODULES + AMLOGIC_GKIX_MODULES + VENDOR_MODULES_ADD
+ALL_MODULES = COMMON_MODULES + AMLOGIC_GKIX_MODULES + MODULES_OUT_ADD + AMLOGIC_MODULES_ANDROID if ANDROID_PROJECT else \
+	      COMMON_MODULES + AMLOGIC_GKIX_MODULES + MODULES_OUT_ADD
 
 ALL_MODULES_REMOVE = \
-	VENDOR_MODULES_REMOVE + UPGRADE_MODULES_REMOVE_R if UPGRADE_PROJECT == "r" or UPGRADE_PROJECT == "R" else \
-	VENDOR_MODULES_REMOVE + UPGRADE_MODULES_REMOVE_S if UPGRADE_PROJECT == "s" or UPGRADE_PROJECT == "S" else \
-	VENDOR_MODULES_REMOVE + UPGRADE_MODULES_REMOVE_P if UPGRADE_PROJECT == "p" or UPGRADE_PROJECT == "P" else \
-	VENDOR_MODULES_REMOVE + UPGRADE_MODULES_REMOVE_U if UPGRADE_PROJECT == "u" or UPGRADE_PROJECT == "U" else \
-	VENDOR_MODULES_REMOVE
+	MODULES_OUT_REMOVE + UPGRADE_MODULES_REMOVE_R if UPGRADE_PROJECT == "r" or UPGRADE_PROJECT == "R" else \
+	MODULES_OUT_REMOVE + UPGRADE_MODULES_REMOVE_S if UPGRADE_PROJECT == "s" or UPGRADE_PROJECT == "S" else \
+	MODULES_OUT_REMOVE + UPGRADE_MODULES_REMOVE_P if UPGRADE_PROJECT == "p" or UPGRADE_PROJECT == "P" else \
+	MODULES_OUT_REMOVE + UPGRADE_MODULES_REMOVE_U if UPGRADE_PROJECT == "u" or UPGRADE_PROJECT == "U" else \
+	MODULES_OUT_REMOVE
 remove_modules_items = {module: None for module in depset(ALL_MODULES_REMOVE).to_list()}
 
 AMLOGIC_MODULES = [module for module in depset(ALL_MODULES).to_list() if module not in remove_modules_items]