From f73610e58205ccac76912f45152f555e6438fe45 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <mmaurer@google.com>
Date: Mon, 4 Feb 2019 12:35:46 -0800
Subject: Add minimal dex set for hiddenapi

hiddenapi, as invoked when the dist target is added, requires that the
boot classpath be nonempty.

Since we want to run dist on the buildbots, I have added a minimal group
of boot jars to the classpath and bumped the image size to fit them.

Bug: 122330825
Test: make PRODUCT-qemu_trusty_arm64-userdebug DIST_DIR=something dist
Change-Id: I8b93f8c54a8a491f13654a531b26ec938ba38933
---
 BoardConfig.mk      |  2 +-
 qemu_trusty_base.mk | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index a06faa4..b4a32db 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -36,7 +36,7 @@ TARGET_USES_64_BIT_BINDER := true
 BUILD_QEMU_IMAGES := true
 
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 33554432 # 32M
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 67108864 # 64M
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 4194304 # 4M
 TARGET_COPY_OUT_VENDOR := vendor
 # ~100 MB vendor image. Please adjust system image / vendor image sizes
diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk
index 385a095..4e57436 100644
--- a/qemu_trusty_base.mk
+++ b/qemu_trusty_base.mk
@@ -77,3 +77,17 @@ PRODUCT_PACKAGES += \
     tipc-test \
     trusty-ut-ctrl \
 
+PRODUCT_BOOT_JARS := \
+    core-oj \
+    core-libart \
+    conscrypt \
+    okhttp \
+    bouncycastle \
+    apache-xml \
+    ext \
+    framework \
+    telephony-common \
+    voip-common \
+    ims-common \
+    android.test.base \
+
-- 
cgit v1.2.3