From aef92033bc6f3a76eed05f9c515425dcf22f69b9 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 1 Nov 2022 16:12:27 -0700
Subject: [PATCH] Hack aosp_riscv64 config to fix `m droid dist`

`m droid dist` fails on hiddenapi rules missing bootclasspath classes,
add default_art_config.mk to set PRODUCT_BOOT_JARS, and then override
PRODUCT_USES_DEFAULT_ART_CONFIG back to false to avoid a dependency
from the boot.zip dist artifact to dex2oat, which doesn't work for
riscv64 yet.

Test: lunch aosp_riscv64-userdebug && m droid dist
Change-Id: Icc332ee9132568251386ec742932f6708312bb92
---
 target/product/aosp_riscv64.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/target/product/aosp_riscv64.mk b/target/product/aosp_riscv64.mk
index 012cc416b8..e9de7c87f7 100644
--- a/target/product/aosp_riscv64.mk
+++ b/target/product/aosp_riscv64.mk
@@ -65,6 +65,9 @@ PRODUCT_PACKAGES := \
   linker \
   shell_and_utilities \
 
+$(call inherit-product, $(SRC_TARGET_DIR)/product/default_art_config.mk)
+PRODUCT_USES_DEFAULT_ART_CONFIG := false
+
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
     root/init.zygote64.rc