commit 91b94b402f9330e7dd86d5189e0d84b040f538fe
author Ben Murdoch <benm@google.com> Wed Mar 22 12:14:33 2017 +0000
committer Ben Murdoch <benm@google.com> Wed Mar 22 12:14:33 2017 +0000
tree fb689b7c80303f7c76618b1ced78771671415139
parent 19357489ba7143604ef50c2c8954689b2d5b68f0

Don't use squashfs for internal Marlin Svelte build.

Possibly just for now as it's preventing the internal
build from booting.

Test: Build, flash, boot marlin_svelte-userdebug.
Change-Id: I798a6bdae26c73b130360b287b41a11a11be9b58

marlin/BoardConfig.mk

diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index d4df8af..dd68871 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -29,7 +29,7 @@
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_KERNEL := false
 TARGET_NO_RECOVERY := true
-ifneq ($(findstring marlin_svelte, $(TARGET_PRODUCT)),)
+ifneq ($(findstring aosp_marlin_svelte, $(TARGET_PRODUCT)),)
 TARGET_RECOVERY_FSTAB := device/google/marlin/fstab.aosp_svelte
 else
 TARGET_RECOVERY_FSTAB := device/google/marlin/fstab.common
@@ -86,7 +86,7 @@
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
-ifneq ($(findstring marlin_svelte, $(TARGET_PRODUCT)),)
+ifneq ($(findstring aosp_marlin_svelte, $(TARGET_PRODUCT)),)
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
 BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0
 BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR := lz4