diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:07:58 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:07:58 +0000 |
| commit | 766a518ae6de4b81c4fc139f90b51521a2f681b7 (patch) | |
| tree | e694616b3a0c42642ed38f396cba9ba5e5ff8671 /core/product.mk | |
| parent | 5cd236c279a16120cabc9e334285277f9e79f213 (diff) | |
| parent | 358c8909f5dd043f9d8bfee61f567701946dc19a (diff) | |
| download | build-766a518ae6de4b81c4fc139f90b51521a2f681b7.zip build-766a518ae6de4b81c4fc139f90b51521a2f681b7.tar.gz build-766a518ae6de4b81c4fc139f90b51521a2f681b7.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
core/Makefile
core/build_id.mk
tools/releasetools/ota_from_target_files.py
Change-Id: Ia1404ee9cd931a6540ea0dd3e2aa7b32d649e80c
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 03490ca..427fd83 100644 --- a/core/product.mk +++ b/core/product.mk @@ -107,6 +107,7 @@ _product_var_list := \ PRODUCT_SYSTEM_PROPERTY_BLACKLIST \ PRODUCT_SYSTEM_SERVER_JARS \ PRODUCT_VBOOT_SIGNING_KEY \ + PRODUCT_VBOOT_SIGNING_SUBKEY \ PRODUCT_VERITY_SIGNING_KEY \ PRODUCT_SYSTEM_VERITY_PARTITION \ PRODUCT_VENDOR_VERITY_PARTITION \ |