diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-20 14:08:43 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-04-20 14:08:43 -0700 |
| commit | 594c0868d42b11e21d77dbdafa571d582b99305a (patch) | |
| tree | 046a1f2ecba2bd2f80cf3cf2bb51d12747c26d17 /core/product.mk | |
| parent | 12753112f3e67c667c97078971d3538ef4fcdda7 (diff) | |
| parent | 6cb3732d82e6a2346c00219931d0f0a3c3257f44 (diff) | |
| download | build-594c0868d42b11e21d77dbdafa571d582b99305a.zip build-594c0868d42b11e21d77dbdafa571d582b99305a.tar.gz build-594c0868d42b11e21d77dbdafa571d582b99305a.tar.bz2 | |
resolved conflicts for merge of 6cb3732d to master
Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
Diffstat (limited to 'core/product.mk')
| -rw-r--r-- | core/product.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/product.mk b/core/product.mk index b7e1aa9..4e8bff1 100644 --- a/core/product.mk +++ b/core/product.mk @@ -232,7 +232,6 @@ _product_stash_var_list := $(_product_var_list) \ TARGET_DEVICE_KERNEL_HEADERS \ TARGET_PRODUCT_KERNEL_HEADERS \ TARGET_BOOTLOADER_BOARD_NAME \ - TARGET_COMPRESS_MODULE_SYMBOLS \ TARGET_NO_BOOTLOADER \ TARGET_NO_KERNEL \ TARGET_NO_RECOVERY \ |