summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Maurer <mmaurer@google.com>2019-02-06 13:55:01 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-06 13:55:01 -0800
commitbb7917300b7f8d14ee8108463b7d62f79c6d016b (patch)
tree3399501211cf73353ce27cf234839ea0e5e52a6c
parent0c68d9d7a994c73b1646eea596ed07db7c7e77e6 (diff)
parentd1dff49fa2878a3b7466e2f2eeb7f644be811396 (diff)
downloaddevice_generic_trusty-bb7917300b7f8d14ee8108463b7d62f79c6d016b.tar.gz
device_generic_trusty-bb7917300b7f8d14ee8108463b7d62f79c6d016b.tar.bz2
device_generic_trusty-bb7917300b7f8d14ee8108463b7d62f79c6d016b.zip
Add minimal dex set for hiddenapi am: f73610e582
am: d1dff49fa2 Change-Id: I14ce7c644da8c6d422165e65dedfc3d8269fafb9
-rw-r--r--BoardConfig.mk2
-rw-r--r--qemu_trusty_base.mk14
2 files changed, 15 insertions, 1 deletions
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 \
+