diff --git a/target/product/aosp_64bitonly_x86_64.mk b/target/product/aosp_64bitonly_x86_64.mk index b8ca3aa634..75fd3c8f17 100644 --- a/target/product/aosp_64bitonly_x86_64.mk +++ b/target/product/aosp_64bitonly_x86_64.mk @@ -58,6 +58,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) # Special settings for GSI releasing # ifeq (aosp_64bitonly_x86_64,$(TARGET_PRODUCT)) +# Build modules from source if this has not been pre-configured +MODULE_BUILD_FROM_SOURCE ?= true + $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) endif diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk index 5f200aafb6..61c13169b9 100644 --- a/target/product/aosp_arm.mk +++ b/target/product/aosp_arm.mk @@ -57,6 +57,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) # Special settings for GSI releasing # ifeq (aosp_arm,$(TARGET_PRODUCT)) +# Build modules from source if this has not been pre-configured +MODULE_BUILD_FROM_SOURCE ?= true + $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) endif diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index ffc37a9bd2..6c907db0ed 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -62,6 +62,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk) # Special settings for GSI releasing # ifeq (aosp_arm64,$(TARGET_PRODUCT)) +# Build modules from source if this has not been pre-configured +MODULE_BUILD_FROM_SOURCE ?= true + $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) endif diff --git a/target/product/aosp_riscv64.mk b/target/product/aosp_riscv64.mk index 0e5d9fec07..270a989620 100644 --- a/target/product/aosp_riscv64.mk +++ b/target/product/aosp_riscv64.mk @@ -53,6 +53,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_riscv64/device.mk) # Special settings for GSI releasing # ifeq (aosp_riscv64,$(TARGET_PRODUCT)) +# Build modules from source if this has not been pre-configured +MODULE_BUILD_FROM_SOURCE ?= true + $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) endif diff --git a/target/product/aosp_x86.mk b/target/product/aosp_x86.mk index 669874e3ad..a2f0390c22 100644 --- a/target/product/aosp_x86.mk +++ b/target/product/aosp_x86.mk @@ -55,6 +55,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) # Special settings for GSI releasing # ifeq (aosp_x86,$(TARGET_PRODUCT)) +# Build modules from source if this has not been pre-configured +MODULE_BUILD_FROM_SOURCE ?= true + $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) endif diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index deaa3b1df3..535ee3f0a7 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -64,6 +64,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk) # Special settings for GSI releasing # ifeq (aosp_x86_64,$(TARGET_PRODUCT)) +# Build modules from source if this has not been pre-configured +MODULE_BUILD_FROM_SOURCE ?= true + $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) endif diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index 09d4bc9a6b..3b977927d1 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -36,7 +36,7 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ # GSI should always support up-to-date platform features. # Keep this value at the latest API level to ensure latest build system # default configs are applied. -PRODUCT_SHIPPING_API_LEVEL := 31 +PRODUCT_SHIPPING_API_LEVEL := 34 # Enable dynamic partitions to facilitate mixing onto Cuttlefish PRODUCT_USE_DYNAMIC_PARTITIONS := true @@ -88,9 +88,6 @@ PRODUCT_BUILD_SUPER_EMPTY_IMAGE := false PRODUCT_BUILD_SYSTEM_DLKM_IMAGE := false PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST := true -# Always build modules from source -MODULE_BUILD_FROM_SOURCE := true - # Additional settings used in all GSI builds PRODUCT_PRODUCT_PROPERTIES += \ ro.crypto.metadata_init_delete_all_keys.enabled=false \