diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-08 00:03:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-08 00:03:03 +0000 |
| commit | 5b99bc00a08603ca37af995d4b78555fcca95091 (patch) | |
| tree | 5c9a73d0241f42b8039820dead7bc962f531eb38 | |
| parent | 2bab653d64e183049e298d62b87d7452beef62f4 (diff) | |
| parent | e4a3e9ee5ae77301c351be2c148e29a54c9edf59 (diff) | |
| download | build-5b99bc00a08603ca37af995d4b78555fcca95091.tar.gz | |
Merge "Update BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE documentation" into main
| -rw-r--r-- | core/product.mk | 5 | ||||
| -rw-r--r-- | 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. |