Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7c1d6e5 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge changes from topic "colefaust_enforce_product_packages_exist" am:... 

Merge changes from topic "colefaust_enforce_product_packages_exist" am: 1be3bddb am: 547767af am: 704d539e

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



Change-Id: I2313436f2f4f1c8e9826485eb5ccbc69ff9f4914
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22785265 704d539e

core/product_config.rbc

+10 −4
Original line number Diff line number Diff line
@@ -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."""