From e4a3e9ee5ae77301c351be2c148e29a54c9edf59 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Tue, 7 May 2024 22:52:17 +0000 Subject: [PATCH] Update BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE documentation With trunk stable, we no longer have multiple development branches, and this flag is no longer in use. Test: N/A (documentation change) Bug: 308188056 Change-Id: Icdaddde9d107de9a453106cae35645b7e6cc21e9 --- core/product.mk | 5 +++-- target/product/module_common.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/product.mk b/core/product.mk index f8634efd25..0a761fb44e 100644 --- a/core/product.mk +++ b/core/product.mk @@ -418,8 +418,9 @@ _product_single_value_vars += PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT # /system/etc/security/fsverity/BuildManifest.apk _product_single_value_vars += PRODUCT_FSVERITY_GENERATE_METADATA -# If true, sets the default for MODULE_BUILD_FROM_SOURCE. This overrides -# BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE but not an explicitly set value. +# If true, this builds the mainline modules from source. This overrides any +# prebuilts selected via RELEASE_APEX_CONTRIBUTIONS_* build flags for the +# current release config. _product_single_value_vars += PRODUCT_MODULE_BUILD_FROM_SOURCE # If true, installs a full version of com.android.virt APEX. diff --git a/target/product/module_common.mk b/target/product/module_common.mk index bf146a0d2f..da4ea23ad9 100644 --- a/target/product/module_common.mk +++ b/target/product/module_common.mk @@ -24,8 +24,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/memtag-common.mk) # uses -DENFORCE_VINTF_MANIFEST. See b/185759877 PRODUCT_SHIPPING_API_LEVEL := 29 -# Builds using a module product should build modules from source, even if -# BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE says otherwise. +# If true, this builds the mainline modules from source. This overrides any +# prebuilts selected via RELEASE_APEX_CONTRIBUTIONS_* build flags for the +# current release config. PRODUCT_MODULE_BUILD_FROM_SOURCE := true # Build sdk from source if the branch is not using slim manifests.