diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-06-15 15:25:27 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2017-06-15 15:26:13 +0100 |
| commit | 89ffe5e56e2c54d7675a468c05e6c6751a5cc8d8 (patch) | |
| tree | dd37efefa50bddfdc1c66b084937a3742daf89d0 /common | |
| parent | d7c5ec09ec09b1df3432fa5c7cff11f630c630df (diff) | |
| parent | ff34af445dc45cdc348ee0fa3f16f7edc055a00e (diff) | |
resolve merge conflicts of ff34af445 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5f3dce08bad394f4057f79b521d0732ff197267e
Diffstat (limited to 'common')
| -rw-r--r-- | common/base.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/common/base.mk b/common/base.mk index d5404c5e..0f24cc07 100644 --- a/common/base.mk +++ b/common/base.mk @@ -845,3 +845,10 @@ PRODUCT_COPY_FILES += \ # dm-verity definitions PRODUCT_SYSTEM_VERITY_PARTITION=/dev/block/platform/soc/624000.ufshc/by-name/system $(call inherit-product, build/target/product/verity.mk) + +PRODUCT_DEXPREOPT_SPEED_APPS += \ + SystemUIGoogle \ + SettingsGoogle \ + NexusLauncherPrebuilt \ + GoogleCamera \ + Maps \ |