diff options
| author | Mohamad Ayyash <mkayyash@google.com> | 2015-06-23 16:22:32 -0700 |
|---|---|---|
| committer | Mohamad Ayyash <mkayyash@google.com> | 2015-06-23 16:22:32 -0700 |
| commit | f35ed6bd8497633c057030e5442cd0fc29b37b6c (patch) | |
| tree | 9a39c836739b9e63e691b292052d200e24d03435 | |
| parent | 552de126e9b05b1c34db1c66a62615fc2ea3cee1 (diff) | |
| parent | cade49ddee44287d1bd5e9688558daf8912f0f9b (diff) | |
| download | build-f35ed6bd8497633c057030e5442cd0fc29b37b6c.zip build-f35ed6bd8497633c057030e5442cd0fc29b37b6c.tar.gz build-f35ed6bd8497633c057030e5442cd0fc29b37b6c.tar.bz2 | |
resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev
| -rw-r--r-- | core/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 9a432da..8ff1111 100644 --- a/core/Makefile +++ b/core/Makefile @@ -685,6 +685,10 @@ ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs) INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) endif +ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs) +INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) +endif + INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS))) ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)) |