summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbohu <bohu@google.com>2019-04-14 20:50:38 -0700
committerbohu <bohu@google.com>2019-05-02 16:01:48 -0700
commitc636add356f364dbd0db8e7b6496b888e1c13722 (patch)
treec2e8fc1be3b1e1ac565f5655775fd6feaf24e5b9
parent24719ceafb169a51407ffe09064039d557ac3a2e (diff)
downloaddevice_google_atv-oreo-mr1-iot-release.tar.gz
device_google_atv-oreo-mr1-iot-release.tar.bz2
device_google_atv-oreo-mr1-iot-release.zip
BUG: 125540538 Change-Id: Ic2939ade168c83075970d5d757bed18a9c96032f Merged-In: Ic2939ade168c83075970d5d757bed18a9c96032f
-rw-r--r--products/sdk_atv_armv7.mk3
-rw-r--r--products/sdk_atv_x86.mk2
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)