commit 9ba365d1bb750d21a786580a06389287ec6214cc
author Alistair Delva <adelva@google.com> Fri Jul 19 13:24:18 2019 -0700
committer Alistair Delva <adelva@google.com> Sun Jul 21 22:51:44 2019 -0700
tree ddad469726dea7e0f141c8168e61f17b2fd6c8b2
parent 54a3bbadc47fa46371311289f1aeec2bf0ad2830

Enable dynamic partitions on tv and auto

This config has had a long soak time on phone and it does not affect the
differentiating features of these lunch targets.

Change-Id: Ide80b1cf71d35704f2db854ac6c9312ad948ab07
Signed-off-by: Alistair Delva <adelva@google.com>

shared/auto/device.mk

diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index b847e3f..0aa170f 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -20,8 +20,6 @@
 DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
 DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/auto/manifest.xml
 
-TARGET_BUILD_SYSTEM_ROOT_IMAGE ?= true
-
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 $(call inherit-product, device/google/cuttlefish/shared/device.mk)
 
@@ -100,3 +98,11 @@
 
 PRODUCT_ENFORCE_RRO_TARGETS := framework-res
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := device/google/cuttlefish/shared/overlay
+
+TARGET_USE_DYNAMIC_PARTITIONS ?= true
+ifeq ($(TARGET_USE_DYNAMIC_PARTITIONS),true)
+  PRODUCT_USE_DYNAMIC_PARTITIONS := true
+  TARGET_BUILD_SYSTEM_ROOT_IMAGE := false
+else
+  TARGET_BUILD_SYSTEM_ROOT_IMAGE ?= true
+endif

shared/tv/device.mk

diff --git a/shared/tv/device.mk b/shared/tv/device.mk
index eefeec2..5f8aec7 100644
--- a/shared/tv/device.mk
+++ b/shared/tv/device.mk
@@ -17,8 +17,6 @@
 DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
 DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/tv/manifest.xml
 
-TARGET_BUILD_SYSTEM_ROOT_IMAGE ?= true
-
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
 $(call inherit-product, device/google/cuttlefish/shared/device.mk)
 
@@ -26,3 +24,11 @@
     ro.lmk.kill_heaviest_task=true \
     ro.lmk.kill_timeout_ms=100 \
     ro.lmk.use_minfree_levels=true \
+
+TARGET_USE_DYNAMIC_PARTITIONS ?= true
+ifeq ($(TARGET_USE_DYNAMIC_PARTITIONS),true)
+  PRODUCT_USE_DYNAMIC_PARTITIONS := true
+  TARGET_BUILD_SYSTEM_ROOT_IMAGE := false
+else
+  TARGET_BUILD_SYSTEM_ROOT_IMAGE ?= true
+endif