diff options
| author | Ying Wang <wangying@google.com> | 2015-02-04 11:28:56 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-02-04 11:28:56 -0800 |
| commit | 16ba2ed82bc084d5355477a381cc0bcc8b60a7bd (patch) | |
| tree | 742bfd2bf13d8b399bfdd78fd684213dd19768ca /core/product.mk | |
| parent | e9bc7b472db2d54aaef428fc3229b56dbe2bf6fa (diff) | |
| parent | 4c178ebcc0069b6f806de4df491bc9a7e1b9d78e (diff) | |
| download | build-16ba2ed82bc084d5355477a381cc0bcc8b60a7bd.zip build-16ba2ed82bc084d5355477a381cc0bcc8b60a7bd.tar.gz build-16ba2ed82bc084d5355477a381cc0bcc8b60a7bd.tar.bz2 | |
resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp
Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
Diffstat (limited to 'core/product.mk')
| -rw-r--r-- | core/product.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/product.mk b/core/product.mk index 3c0bfc3..13324dd 100644 --- a/core/product.mk +++ b/core/product.mk @@ -96,8 +96,6 @@ _product_var_list := \ PRODUCT_DEFAULT_DEV_CERTIFICATE \ PRODUCT_RESTRICT_VENDOR_FILES \ PRODUCT_VENDOR_KERNEL_HEADERS \ - PRODUCT_FACTORY_RAMDISK_MODULES \ - PRODUCT_FACTORY_BUNDLE_MODULES \ PRODUCT_BOOT_JARS \ PRODUCT_SUPPORTS_VERITY \ PRODUCT_OEM_PROPERTIES \ |