HACK: disable most of the build for riscv64

Disable most of the inherited product makefiles so that `m droid`
passes, and then add back a few working packages to PRODUCT_PACKAGES.

Test: lunch aosp_riscv64-userdebug && m droid
Change-Id: Ifbc4758735ec29876cbdd5a2ec97dd99aaebc210
This commit is contained in:
Colin Cross
2022-11-01 09:29:18 -07:00
parent fb5f2de383
commit f310841384

View File

@@ -30,33 +30,41 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
# GSI for system/product & support 64-bit apps only # GSI for system/product & support 64-bit apps only
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) #$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
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
# just the modules that work for riscv64.
PRODUCT_PACKAGES := \
init \
linker \
shell_and_utilities \
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
root/init.zygote64.rc root/init.zygote64.rc