diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-01-28 13:10:27 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-01-28 13:10:27 -0800 |
| commit | c5151cf0ece28aa754cb29d807ee26f32f7dc576 (patch) | |
| tree | 114d3df6e4aa8812047adb855ed386641eb7a30b /core/product_config.mk | |
| parent | ed9f6bb3840e9cbc90f1a64d0af830f9ce9011b1 (diff) | |
| parent | 1737b1ab5fe4e084507631a5308d826d3643f7c2 (diff) | |
| download | replicant_build-c5151cf0ece28aa754cb29d807ee26f32f7dc576.zip replicant_build-c5151cf0ece28aa754cb29d807ee26f32f7dc576.tar.gz replicant_build-c5151cf0ece28aa754cb29d807ee26f32f7dc576.tar.bz2 | |
resolved conflicts for merge of 1737b1ab to master
Change-Id: I5a5f2e83c5155c1c783711f736c60198a8f404ee
Diffstat (limited to 'core/product_config.mk')
| -rw-r--r-- | core/product_config.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/product_config.mk b/core/product_config.mk index b438830..6688281 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -404,3 +404,7 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort \ PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_EXTRA_RECOVERY_KEYS)) + +# If there is no room in /system for the image, place it in /data +PRODUCT_DEX_PREOPT_IMAGE_IN_DATA := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_IMAGE_IN_DATA)) |