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

Merge "Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk"

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-24 13:11:18 +00:00
committed by Gerrit Code Review
parent 5ca02ff114 105610bdf0
commit 4a9b9b4d89
7 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
target/product/aosp_64bitonly_x86_64.mk
View File

@@ -58,6 +58,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
# Special settings for GSI releasing # Special settings for GSI releasing
# #
ifeq (aosp_64bitonly_x86_64,$(TARGET_PRODUCT)) 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) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
endif endif

3
target/product/aosp_arm.mk
View File

@@ -57,6 +57,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
# Special settings for GSI releasing # Special settings for GSI releasing
# #
ifeq (aosp_arm,$(TARGET_PRODUCT)) 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) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
endif endif

3
target/product/aosp_arm64.mk
View File

@@ -62,6 +62,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)
# Special settings for GSI releasing # Special settings for GSI releasing
# #
ifeq (aosp_arm64,$(TARGET_PRODUCT)) 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) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
endif endif

3
target/product/aosp_riscv64.mk
View File

@@ -53,6 +53,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_riscv64/device.mk)
# Special settings for GSI releasing # Special settings for GSI releasing
# #
ifeq (aosp_riscv64,$(TARGET_PRODUCT)) 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) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
endif endif

3
target/product/aosp_x86.mk
View File

@@ -55,6 +55,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
# Special settings for GSI releasing # Special settings for GSI releasing
# #
ifeq (aosp_x86,$(TARGET_PRODUCT)) 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) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
endif endif

3
target/product/aosp_x86_64.mk
View File

@@ -64,6 +64,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)
# Special settings for GSI releasing # Special settings for GSI releasing
# #
ifeq (aosp_x86_64,$(TARGET_PRODUCT)) 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) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
endif endif

5
target/product/gsi_release.mk
View File

@@ -36,7 +36,7 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
# GSI should always support up-to-date platform features. # GSI should always support up-to-date platform features.
# Keep this value at the latest API level to ensure latest build system # Keep this value at the latest API level to ensure latest build system
# default configs are applied. # default configs are applied.
PRODUCT_SHIPPING_API_LEVEL := 31 PRODUCT_SHIPPING_API_LEVEL := 34
# Enable dynamic partitions to facilitate mixing onto Cuttlefish # Enable dynamic partitions to facilitate mixing onto Cuttlefish
PRODUCT_USE_DYNAMIC_PARTITIONS := true PRODUCT_USE_DYNAMIC_PARTITIONS := true
@@ -88,9 +88,6 @@ PRODUCT_BUILD_SUPER_EMPTY_IMAGE := false
PRODUCT_BUILD_SYSTEM_DLKM_IMAGE := false PRODUCT_BUILD_SYSTEM_DLKM_IMAGE := false
PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST := true PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST := true
# Always build modules from source
MODULE_BUILD_FROM_SOURCE := true
# Additional settings used in all GSI builds # Additional settings used in all GSI builds
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
ro.crypto.metadata_init_delete_all_keys.enabled=false \ ro.crypto.metadata_init_delete_all_keys.enabled=false \