From dd9e1e40a305294da09d28cfcd63d2b16cb9bf89 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 2 Nov 2022 18:49:09 +0000 Subject: [PATCH] aosp_riscv64: inherit from default products that don't break the build Uncomment everything in aosp_riscv64.mk that doesn't break the aosp_riscv64-userdebug build. Test: m droid dist Change-Id: I29b07d74fb8e93848bd422287e9cfaa32bde6d93 --- target/product/aosp_riscv64.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/product/aosp_riscv64.mk b/target/product/aosp_riscv64.mk index 1f6c273f37..023317b9f6 100644 --- a/target/product/aosp_riscv64.mk +++ b/target/product/aosp_riscv64.mk @@ -36,26 +36,26 @@ TARGET_FLATTEN_APEX := false # # 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/telephony_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) # # 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 # -#$(call inherit-product-if-exists, device/generic/goldfish/riscv64-vendor.mk) -#$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_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)/board/generic_riscv64/device.mk) # # Special settings for GSI releasing # 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 # TODO: this list should come via mainline_system.mk, but for now list