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

Merge "aosp_riscv64: inherit from default products that don't break the build"

Browse Source
This commit is contained in:
Colin Cross
2022-11-05 00:30:05 +00:00
committed by Gerrit Code Review
parent d1e43a8d7c dd9e1e40a3
commit 9091700e3d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
target/product/aosp_riscv64.mk
View File

@@ -36,26 +36,26 @@ TARGET_FLATTEN_APEX := false
# #
# All components inherited here go to system_ext image # All components inherited here go to system_ext image
# #
#$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
#$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
# #
# All components inherited here go to product image # All components inherited here go to product image
# #
#$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
# #
# All components inherited here go to vendor image # All components inherited here go to vendor image
# #
#$(call inherit-product-if-exists, device/generic/goldfish/riscv64-vendor.mk) $(call inherit-product-if-exists, device/generic/goldfish/riscv64-vendor.mk)
#$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_riscv64/device.mk) $(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))
#$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
endif endif
# TODO: this list should come via mainline_system.mk, but for now list # TODO: this list should come via mainline_system.mk, but for now list