Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cd44cd6 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

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

Merge "aosp_riscv64: inherit from default products that don't break the build" am: 9091700e am: 7b7af991

Original change: https://android-review.googlesource.com/c/platform/build/+/2287164



Change-Id: I6d6a24a1bdd860974f732bc0a025455abdf7594e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d3a5dab 7b7af991

target/product/aosp_riscv64.mk

+6 −6
Original line number Diff line number Diff line
@@ -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