diff options
| author | Matthew Maurer <mmaurer@google.com> | 2019-02-04 12:35:46 -0800 |
|---|---|---|
| committer | Matthew Maurer <mmaurer@google.com> | 2019-02-06 12:52:04 -0800 |
| commit | f73610e58205ccac76912f45152f555e6438fe45 (patch) | |
| tree | 3399501211cf73353ce27cf234839ea0e5e52a6c | |
| parent | b82e0d16ae7afaee167b3caa75b1840444e27870 (diff) | |
| download | device_generic_trusty-f73610e58205ccac76912f45152f555e6438fe45.tar.gz device_generic_trusty-f73610e58205ccac76912f45152f555e6438fe45.tar.bz2 device_generic_trusty-f73610e58205ccac76912f45152f555e6438fe45.zip | |
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
| -rw-r--r-- | BoardConfig.mk | 2 | ||||
| -rw-r--r-- | qemu_trusty_base.mk | 14 |
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 \ + |