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

Merge changes from topic "colefaust_enforce_product_packages_exist" am: 1be3bddbfa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2063512

Change-Id: I3d98fec7c04e8e846821eedcc0ab495055ba79dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2022-04-14 17:38:45 +00:00
committed by Automerger Merge Worker
parent 414100caeb 1be3bddbfa
commit 547767afb8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/product_config.rbc
View File

@@ -164,6 +164,10 @@ def _product_configuration(top_pcm_name, top_pcm, input_variables_init):
globals.setdefault("ARTIFACT_PATH_REQUIREMENT_PRODUCTS", [])
globals["ARTIFACT_PATH_REQUIREMENT_PRODUCTS"] = sorted(globals["ARTIFACT_PATH_REQUIREMENT_PRODUCTS"] + [name+".mk"])
if handle.product_enforce_packages_exist[0]:
globals["PRODUCTS."+name+".mk.PRODUCT_ENFORCE_PACKAGES_EXIST"] = "true"
globals["PRODUCTS."+name+".mk.PRODUCT_ENFORCE_PACKAGES_EXIST_ALLOW_LIST"] = handle.product_enforce_packages_exist_allow_list
# Now we know everything about this PCM, record it in 'configs'.
children = handle.inherited_modules
if _options.trace_modules:
@@ -434,6 +438,8 @@ def __h_new():
artifact_path_requirements = list(),
artifact_path_allowed_list = list(),
artifact_path_requirement_is_relaxed = [False], # as a list so that we can reassign it
product_enforce_packages_exist = [False],
product_enforce_packages_exist_allow_list = [],
)
def __h_cfg(handle):
@@ -498,11 +504,11 @@ def _copy_if_exists(path_pair):
# Check that l[0] exists
return [":".join(value)] if rblf_file_exists(value[0]) else []
def _enforce_product_packages_exist(pkg_string_or_list):
def _enforce_product_packages_exist(handle, pkg_string_or_list=[]):
"""Makes including non-existent modules in PRODUCT_PACKAGES an error."""
#TODO(asmundak)
pass
handle.product_enforce_packages_exist[0] = True
handle.product_enforce_packages_exist_allow_list.clear()
handle.product_enforce_packages_exist_allow_list.extend(__words(pkg_string_or_list))
def _add_product_dex_preopt_module_config(handle, modules, config):
"""Equivalent to add-product-dex-preopt-module-config from build/make/core/product.mk."""