diff options
| author | Mohamad Ayyash <mkayyash@google.com> | 2015-03-04 15:43:45 -0800 |
|---|---|---|
| committer | Mohamad Ayyash <mkayyash@google.com> | 2015-03-04 15:43:45 -0800 |
| commit | 9b19382f0e55be199da4b3f604fc114aba8fb2fc (patch) | |
| tree | c63bfdecc67428c27202c50fc320f634ab7a0210 /core/product.mk | |
| parent | a10263ed1f1532127a135943dce993443c5dca51 (diff) | |
| parent | fc759204d63f0c82f187d99f58efa4821674ccb8 (diff) | |
| download | build-9b19382f0e55be199da4b3f604fc114aba8fb2fc.zip build-9b19382f0e55be199da4b3f604fc114aba8fb2fc.tar.gz build-9b19382f0e55be199da4b3f604fc114aba8fb2fc.tar.bz2 | |
resolved conflicts for merge of fc759204 to stage-aosp-master
Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab
Diffstat (limited to 'core/product.mk')
| -rw-r--r-- | core/product.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/product.mk b/core/product.mk index 3d2b6b9..d3df582 100644 --- a/core/product.mk +++ b/core/product.mk @@ -252,6 +252,7 @@ _product_stash_var_list += \ BOARD_BOOTIMAGE_PARTITION_SIZE \ BOARD_RECOVERYIMAGE_PARTITION_SIZE \ BOARD_SYSTEMIMAGE_PARTITION_SIZE \ + BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE \ BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE \ BOARD_USERDATAIMAGE_PARTITION_SIZE \ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE \ |