summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Rassieur <rassb@google.com>2019-04-02 18:23:24 +0000
committerBill Rassieur <rassb@google.com>2019-04-02 18:23:24 +0000
commit2540d813fe03055ce59c1edc7389e940aaedb95c (patch)
tree055a946cdba9fcad2b927c289443a34a1708b2c5
parent93698a8eba7572c95480053d803c807c4ebab05a (diff)
parent16894185d7d52155a86082d792176f27127bf4d3 (diff)
downloaddevice_generic_trusty-2540d813fe03055ce59c1edc7389e940aaedb95c.tar.gz
device_generic_trusty-2540d813fe03055ce59c1edc7389e940aaedb95c.tar.bz2
device_generic_trusty-2540d813fe03055ce59c1edc7389e940aaedb95c.zip
Merge master@5428150 into git_qt-dev-plus-aosp.
Change-Id: I2ae0fcb073b8c38d656541aa281518fb684a647f BUG: 129345239
-rw-r--r--BoardConfig.mk2
-rw-r--r--qemu_trusty_base.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index b4a32db..50a330f 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 := 67108864 # 64M
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 268435456 # 256M
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 e910048..7862ebe 100644
--- a/qemu_trusty_base.mk
+++ b/qemu_trusty_base.mk
@@ -22,6 +22,7 @@ PRODUCT_PACKAGES += \
adbd \
android.hidl.allocator@1.0-service \
apexd \
+ com.android.runtime \
dhcpclient \
hwservicemanager \
init \