diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-05 23:12:21 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-05 23:12:21 +0000 |
commit | 98cb6135a8397893b49f29a0110a24ce1dcb3769 (patch) | |
tree | c6644f095f33b3e4c505f45ab57d0e49bf8c14d4 | |
parent | e3a12450e60a3c0a5695cba0c661fb4fc4d8a786 (diff) | |
parent | 36b60b467769a24f5ebc727d909a3f0b995e1175 (diff) | |
download | atv-98cb6135a8397893b49f29a0110a24ce1dcb3769.tar.gz |
Snap for 5534160 from 36b60b467769a24f5ebc727d909a3f0b995e1175 to qt-release
Change-Id: Ia8c5a512469b6ce04aaaeaaf672f18fb37db68f0
-rw-r--r-- | products/sdk_atv_armv7.mk | 3 | ||||
-rw-r--r-- | products/sdk_atv_x86.mk | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/products/sdk_atv_armv7.mk b/products/sdk_atv_armv7.mk index b7ef8dd..c112b17 100644 --- a/products/sdk_atv_armv7.mk +++ b/products/sdk_atv_armv7.mk @@ -16,8 +16,7 @@ PRODUCT_IS_ATV_SDK := true -# Disable dynamic partition sizes. -PRODUCT_USE_DYNAMIC_PARTITION_SIZE := false +PRODUCT_USE_DYNAMIC_PARTITIONS := true PRODUCT_PACKAGES := \ LeanbackSampleApp \ diff --git a/products/sdk_atv_x86.mk b/products/sdk_atv_x86.mk index 6f2d544..b897416 100644 --- a/products/sdk_atv_x86.mk +++ b/products/sdk_atv_x86.mk @@ -22,7 +22,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ - prebuilts/qemu-kernel/x86_64/4.4/kernel-qemu2:kernel-ranchu-64 + prebuilts/qemu-kernel/x86_64/4.14/kernel-qemu2:kernel-ranchu-64 # TODO: separate out a common base for arm/x86 atv SDK build. $(call inherit-product, device/google/atv/products/sdk_atv_armv7.mk) |